KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scripts/feeds: observe -p flag for preferential feeds

Browse source 
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>

SVN-Revision: 46120
This commit is contained in:
Steven Barth 2015-06-24 10:57:20 +00:00
parent 6010a1cdb7
commit b6d0061fec
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 $force = shift;
my $ret = 0; my $ret = 0;
$feed = lookup_target($feed, $name); my $this_feed_target = lookup_target($feed, $name);
$feed and do { $this_feed_target and do {
$installed_targets{$name} and return 0; $installed_targets{$name} and return 0;
install_target($feed, $name); install_target($this_feed_target, $name);
return 0; return 0;
}; };