diff mbox series

[OpenWrt-Devel] scripts/feeds: fix 'src-include' directive

Message ID 20190902114921.8225-1-bjorn@mork.no
State Accepted
Headers show
Series [OpenWrt-Devel] scripts/feeds: fix 'src-include' directive | expand

Commit Message

Bjørn Mork Sept. 2, 2019, 11:49 a.m. UTC 
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>
---
 scripts/feeds | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/scripts/feeds b/scripts/feeds
index e36e044a11a8..8de4075bc7ed 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -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;
 		}