scripts/feeds: fix 'src-include' directive
authorBjørn Mork <bjorn@mork.no>
Mon, 2 Sep 2019 11:49:21 +0000 (13:49 +0200)
committerRISCi_ATOM <bob@bobcall.me>
Fri, 13 Sep 2019 20:18:55 +0000 (16:18 -0400)
Commit 775b70f8d5df renamed parse_file() parameters without
updating the recursive call. This broke parsing of any feeds.conf
using 'src-include'.

 $ scripts/feeds update -a
 Can't use string ("defaults") as a HASH ref while "strict refs" in use at scripts/feeds line 63, <$fh> line 1.

Fixes: 775b70f8d5df ("scripts/feeds: allow adding parameters to feeds")
Signed-off-by: Bjørn Mork <bjorn@mork.no>
(cherry picked from commit a21b70be31a9d8adda0ae65cc38d1b3b4b6680d4)

scripts/feeds

index 6bc973deaf636fdb1d5c7abb3cdbf76ec67307fd..5d9a58259d34ee0944240bdab05db90d3a27af9a 100755 (executable)
@@ -75,7 +75,7 @@ sub parse_file($$) {
                }
 
                if ($type eq "include") {
-                       parse_file($urls, $name) or
+                       parse_file($urls, $existing) or
                            die "Unable to open included file '$urls'";
                        next;
                }