From: Bjørn Mork <bjorn@mork.no>
Date: Mon, 2 Sep 2019 11:49:21 +0000 (+0200)
Subject: scripts/feeds: fix 'src-include' directive
X-Git-Tag: v1.5.0-rc2~56
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=645670d9f5059be7e45c04b4006c0ff3f6f2af56;p=librecmc%2Flibrecmc.git

scripts/feeds: fix 'src-include' directive

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)
---

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;
 		}