Changeset 2511 in ProjectBuilder

Timestamp:

Apr 2, 2020, 12:34:31 AM (5 years ago)

Author:

Bruno Cornec

Message:

Fix pbgetparam and pb_distro_conf_print by relacing key value checking

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -1040 +1040 @@
 my $i = 0;
 # Index on distro
-foreach my $r (pb_distro_get($pbos,@keys)) {
+foreach my $r (pb_distro_get_if($pbos,@keys)) {
     $rep{$keys[$i]} = $r if (defined $keys[$i]);
     $i++;
@@ -1046 +1046 @@
 $i = 0;
 # Then Index on prj to overwrite previous value if needed
-foreach my $r (pb_conf_get(@keys)) {
+foreach my $r (pb_conf_get_if(@keys)) {
     $rep{$keys[$i]} = $r->{'default'} if (defined  $r->{'default'});
     $rep{$keys[$i]} = $r->{$ENV{'PBPROJ'}} if (defined  $r->{$ENV{'PBPROJ'}});
@@ -1053 +1053 @@
 foreach my $r (keys %rep) {
     pb_log(1, "$r => ");
-    pb_log(0, "$rep{$r}\n") if ($all == 0);
-    pb_log(0, "$r = $rep{$r}\n") if ($all == 1);
+    pb_log(0, "$rep{$r}\n") if (($all == 0) && (defined $rep{$r}));
+    pb_log(0, "$r = $rep{$r}\n") if (($all == 1) && (defined $rep{$r}));
 }
 }