From: cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 7 Jul 2015 11:30:39 +0000 (+0000)
Subject: scripts/feeds: observe -p flag for preferential feeds
X-Git-Tag: 15.05~89
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=94606dcbe82b9f39c8e6a1544afa607f8568a87c;p=15.05%2Fopenwrt.git

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
---

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;
 	};