Re: [OpenWrt-Devel] [PATCHv2] scripts/feeds: observe -p flag for preferential feeds

2015-06-23 Thread Karl Palsson 

Karl Palsson ka...@tweak.net.au wrote:
  John Crispin blo...@openwrt.org wrote:
   On 27/05/2015 18:03, Karl Palsson wrote:
+   my $this_feed_target = lookup_target($feed, $name);
+   $this_feed_target and do {
   
   how about just calling it $target ?
  
  Because even though the method is lookup_target it actually returns a
  feed for the target $name.
  
  I could change the method to lookup_feed_for_target too, if that would
  help.
 
 Is anything else needed here?  Would be nice to get this fixed before
 it's branched.
 

Anything?  It now should be backported to CC as well, given that this is
documented behaviour of scripts/feeds that's regressed.

Sincerely,
Karl Palsson___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCHv2] scripts/feeds: observe -p flag for preferential feeds

2015-06-09 Thread Karl Palsson 

Karl Palsson ka...@tweak.net.au wrote:
 
 John Crispin blo...@openwrt.org wrote:
  On 27/05/2015 18:03, Karl Palsson wrote:
   + my $this_feed_target = lookup_target($feed, $name);
   + $this_feed_target and do {
  
  how about just calling it $target ?
 
 Because even though the method is lookup_target it actually returns a
 feed for the target $name.
 
 I could change the method to lookup_feed_for_target too, if that would
 help.

Hi,

Is anything else needed here?  Would be nice to get this fixed before
it's branched.

Sincerely,
Karl Palsson___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCHv2] scripts/feeds: observe -p flag for preferential feeds

2015-06-01 Thread Karl Palsson 

John Crispin blo...@openwrt.org wrote:
 On 27/05/2015 18:03, Karl Palsson wrote:
  +   my $this_feed_target = lookup_target($feed, $name);
  +   $this_feed_target and do {
 
 how about just calling it $target ?

Because even though the method is lookup_target it actually returns a
feed for the target $name.

I could change the method to lookup_feed_for_target too, if that would
help.

Sincerely,
Karl Palsson___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCHv2] scripts/feeds: observe -p flag for preferential feeds

2015-05-31 Thread John Crispin 
On 27/05/2015 18:03, Karl Palsson wrote:
 + my $this_feed_target = lookup_target($feed, $name);
 + $this_feed_target and do {

how about just calling it $target ?
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCHv2] scripts/feeds: observe -p flag for preferential feeds

2015-05-27 Thread Karl Palsson 
From: Karl Palsson ka...@remake.is

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 ka...@remake.is
---
Changes since v1:
 Make sure to not just trample a global variable.  Aren't globals fun. Thanks
 to Felix for pointing it out

 scripts/feeds | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/feeds b/scripts/feeds
index a6be9cc..55756d9 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;
};
 
-- 
2.1.0
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel