projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ramips: copy patches and kernel config to 5.4
[oweals/openwrt.git]
/
scripts
/
feeds
diff --git
a/scripts/feeds
b/scripts/feeds
index e36e044a11a8af1312ea337f90533d09d3e55946..69ab60278a1a12bc5446cf5245c9f8cdac09d349 100755
(executable)
--- a/
scripts/feeds
+++ b/
scripts/feeds
@@
-55,7
+55,7
@@
sub parse_file($$) {
$line++;
next unless /\S/;
$line++;
next unless /\S/;
- my ($type, $flags, $name, $urls) = m!^src-(
\w
+)((?:\s+--\w+(?:=\S+)?)*)\s+(\w+)(?:\s+(\S.*))?$!;
+ my ($type, $flags, $name, $urls) = m!^src-(
[\w\-]
+)((?:\s+--\w+(?:=\S+)?)*)\s+(\w+)(?:\s+(\S.*))?$!;
unless ($type && $name) {
die "Syntax error in $fname, line $line\n";
}
unless ($type && $name) {
die "Syntax error in $fname, line $line\n";
}
@@
-75,7
+75,7
@@
sub parse_file($$) {
}
if ($type eq "include") {
}
if ($type eq "include") {
- parse_file($urls, $
name
) or
+ parse_file($urls, $
existing
) or
die "Unable to open included file '$urls'";
next;
}
die "Unable to open included file '$urls'";
next;
}