scripts/feeds: observe -p flag for preferential feeds
authorSteven Barth <cyrus@openwrt.org>
Wed, 24 Jun 2015 10:57:20 +0000 (10:57 +0000)
committerSteven Barth <cyrus@openwrt.org>
Wed, 24 Jun 2015 10:57:20 +0000 (10:57 +0000)
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

scripts/feeds

index b6d2f45..f8f29cd 100755 (executable)
@@ -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;
        };