mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-19 23:28:29 +02:00
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> SVN-Revision: 46120
This commit is contained in:
parent
6010a1cdb7
commit
b6d0061fec
|
@ -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;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user