projects
/
openwrt
/
staging
/
hauke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0cd5e85
)
scripts/feeds: fix install of packages with different source/binary names
author
Matthias Schiffer
<mschiffer@universe-factory.net>
Sun, 14 Jan 2018 16:07:28 +0000
(17:07 +0100)
committer
Matthias Schiffer
<mschiffer@universe-factory.net>
Sun, 14 Jan 2018 16:07:58 +0000
(17:07 +0100)
The logic for choice between source and binary packages was reversed.
Fixes: 52719c2b67af "metadata: scripts/feeds: distinguish between source
and binary packages, resolve virtual dependencies"
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
scripts/feeds
patch
|
blob
|
history
diff --git
a/scripts/feeds
b/scripts/feeds
index 4ee5a33991cf80e9ff147ffa4875b017b6f159e2..f49cdb3e457d5256108e84c4bb52d1069a57a1dd 100755
(executable)
--- a/
scripts/feeds
+++ b/
scripts/feeds
@@
-580,7
+580,7
@@
sub install_target_or_package {
};
my $this_feed_src = lookup_src($feed, $name);
- $this_feed_src
or
do {
+ $this_feed_src
and
do {
return install_src($this_feed_src, $name, $force);
};