Changeset 1898 in ProjectBuilder for devel/pb-modules/bin/pbgetparam

Timestamp:

Sep 30, 2014, 10:08:00 AM (10 years ago)

Author:

Bruno Cornec

Message:

pbdistrogetparam -> pbgetparam and fix printing of values now for both
project and distros

File:

• devel/pb-modules/bin/pbgetparam (moved) (moved from devel/pb-modules/bin/pbdistrogetparam ) (1 diff)

devel/pb-modules/bin/pbgetparam

@@ -114 +114 @@
 @tab = pb_conf_get_all() if (defined $opts{'a'});
 
+my %rep;
 my $i = 0;
-my %rep;
+# Index on prj
 foreach my $r (pb_conf_get(@tab)) {
-    $rep{$tab[$i]} = $r->{$ENV{'PBPROJ'}} if (((defined $opts{'v'}) || (defined $opts{'a'})) && (defined  $r->{$ENV{'PBPROJ'}}));
+    $rep{$tab[$i]} = $r->{'default'} if (defined  $r->{'default'});
+    $rep{$tab[$i]} = $r->{$ENV{'PBPROJ'}} if (defined  $r->{$ENV{'PBPROJ'}});
     $i++;
 }
+# Index on distro
+$i = 0;
 foreach my $r (pb_distro_get_param($pbos,pb_conf_get(@tab))) {
-    $rep{$tab[$i]} = $r if (((defined $opts{'v'}) || (defined $opts{'a'})) && (defined $tab[$i]));
+    $rep{$tab[$i]} = $r if (defined $tab[$i]);
     $i++;
 }
 foreach my $r (keys %rep) {
     print "$r => " if ((defined $opts{'v'}) || (defined $opts{'a'}));
-    $i++;
     print "$rep{$r}\n";
 }