From 52c3a2972cf7cdd7184e8d60d684df459860d255 Mon Sep 17 00:00:00 2001
From: cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 24 Jun 2015 10:57:20 +0000
Subject: [PATCH] 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/trunk@46120 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
scripts/feeds | 6 +++---
1 file 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;
};
--
GitLab