scripts/feeds: fix 'src-include' directive
authorBjørn Mork <bjorn@mork.no>
Mon, 2 Sep 2019 11:49:21 +0000 (13:49 +0200)
committerJo-Philipp Wich <jo@mein.io>
Wed, 4 Sep 2019 11:46:35 +0000 (13:46 +0200)
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 e36e044a11a8af1312ea337f90533d09d3e55946..8de4075bc7edc3ccdc680955d2ef92721273ecd4 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;
                }