diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-06-24 10:57:20 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-06-24 10:57:20 +0000 |
| commit | b6d0061fecbae2f08e00d143b0a293672a2bdb4a (patch) | |
| tree | 7fdd59779c9cc99604eece55f5aa745c764bc2d6 /scripts | |
| parent | 6010a1cdb729aefdb1121b29b26347c664e20fff (diff) | |
| download | upstream-b6d0061fecbae2f08e00d143b0a293672a2bdb4a.tar.gz upstream-b6d0061fecbae2f08e00d143b0a293672a2bdb4a.tar.bz2 upstream-b6d0061fecbae2f08e00d143b0a293672a2bdb4a.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>
SVN-Revision: 46120
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; }; |