diff options
| author | Steven Barth <steven@midlink.org> | 2015-07-07 11:30:39 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-07-07 11:30:39 +0000 |
| commit | 72cab74402aeaa082b22b996782c49e02a212d7e (patch) | |
| tree | ba2acb021ad471aff7dc88ede2af80cddcbd336b /scripts | |
| parent | 80f958c88d76781169ea60daa899fc6664a218b4 (diff) | |
| download | upstream-72cab74402aeaa082b22b996782c49e02a212d7e.tar.gz upstream-72cab74402aeaa082b22b996782c49e02a212d7e.tar.bz2 upstream-72cab74402aeaa082b22b996782c49e02a212d7e.zip | |
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
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/feeds | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/feeds b/scripts/feeds index b6d2f45e72..f8f29cd9dd 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -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; }; |