emeryth
/
openwrt_zsun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts/feeds: observe -p flag for preferential feeds 

lookup_target was trampling the $feed variable, resulting in the -p flag
no longer preferentially installing from the named feed.

Make sure to use a local variable for this instead.

Signed-off-by: Karl Palsson <karlp@remake.is>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46213 3c298f89-4303-0410-b956-a3cf2f4a3e73
zsun
cyrus 2015-07-07 11:30:39 +00:00
parent 54b2f42f72
commit 94606dcbe8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/feeds
View File

@ -450,10 +450,10 @@ sub install_package {
my $force = shift;
my $ret = 0;
$feed = lookup_target($feed, $name);
$feed and do {
my $this_feed_target = lookup_target($feed, $name);
$this_feed_target and do {
$installed_targets{$name} and return 0;
install_target($feed, $name);
install_target($this_feed_target, $name);
return 0;
};