From 645670d9f5059be7e45c04b4006c0ff3f6f2af56 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B8rn=20Mork?= Date: Mon, 2 Sep 2019 13:49:21 +0200 Subject: [PATCH] scripts/feeds: fix 'src-include' directive MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit a21b70be31a9d8adda0ae65cc38d1b3b4b6680d4) --- scripts/feeds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/feeds b/scripts/feeds index 6bc973deaf..5d9a58259d 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; } -- 2.25.1