Author: cyrus Date: 2015-06-24 12:57:20 +0200 (Wed, 24 Jun 2015) New Revision: 46120
Modified: trunk/scripts/feeds Log: 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 <[email protected]> Modified: trunk/scripts/feeds =================================================================== --- trunk/scripts/feeds 2015-06-24 10:57:14 UTC (rev 46119) +++ trunk/scripts/feeds 2015-06-24 10:57:20 UTC (rev 46120) @@ -450,10 +450,10 @@ 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; }; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
