aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/feeds
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2019-09-02 13:49:21 +0200
committerJo-Philipp Wich <jo@mein.io>2019-09-04 13:46:35 +0200
commit7c811372d823d627e4150ea3b4adcd57a5a2794a (patch)
tree024e62bed1d0ccda281a324ccd722b01c70f0b9d /scripts/feeds
parent0d4ab1559a667b0f2daef32638d80aaca95991c6 (diff)
downloadupstream-7c811372d823d627e4150ea3b4adcd57a5a2794a.tar.gz
upstream-7c811372d823d627e4150ea3b4adcd57a5a2794a.tar.bz2
upstream-7c811372d823d627e4150ea3b4adcd57a5a2794a.zip
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)
Diffstat (limited to 'scripts/feeds')
-rwxr-xr-xscripts/feeds2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/feeds b/scripts/feeds
index e36e044a11..8de4075bc7 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;
}