BigW Consortium Gitlab

Commit 94606dcb by cyrus

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: 's avatarKarl Palsson <karlp@remake.is> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46213 3c298f89-4303-0410-b956-a3cf2f4a3e73
parent 54b2f42f
......@@ -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;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment