Changeset 2153 in ProjectBuilder for devel/pb-modules

Timestamp:

Dec 23, 2016, 2:45:39 AM (7 years ago)

Author:

Bruno Cornec

Message:

• Use function pb_distro_conf_print in pbgetparam to avoid code duplication
• Improve pb_distro_conf_print with former code from pbgetparam

Location:

devel/pb-modules

Files:

• bin/pbgetparam (modified) (1 diff)
• lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)

devel/pb-modules/bin/pbgetparam

@@ -108 +108 @@
 
 my $dist = $opts{'d'};
+my $pbos = pb_distro_get_context($dist);
 pb_env_init($opts{'p'},0,"getconf",0);
-my $pbos = pb_distro_get_context($dist);
 
 my @tab = @ARGV;
 @tab = pb_conf_get_all() if (defined $opts{'a'});
 
-my %rep;
-my $i = 0;
-# Index on prj
-foreach my $r (pb_conf_get(@tab)) {
-    $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 $tab[$i]);
-    $i++;
-}
-foreach my $r (keys %rep) {
-    print "$r => " if ((defined $opts{'v'}) || (defined $opts{'a'}));
-    print "$rep{$r}\n";
-}
+pb_distro_conf_print($pbos,@tab);

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

@@ -748 +748 @@
 my $pbos = shift;
 my @keys = @_;
+my $ldebug = $pbdebug;
 
 if ($#keys == -1) {
     pb_log(0,"Full pb configuration for project $ENV{'PBPROJ'}\n");
     pb_log(0,"================================================\n");
+    @keys = pb_conf_get_all();
+    $ldebug = 1;
 }
 if (defined $ENV{'PBV'}) {
@@ -761 +764 @@
 }
 
-if ($#keys == -1) {
-    foreach my $k (pb_conf_get_all()) {
-        pb_log(0,"$k => ".Dumper(pb_conf_get($k))."\n");
-    }
-} else {
-    foreach my $k (@keys) {
-        pb_log(0,"$k=".pb_distro_get_param($pbos,pb_conf_get($k))."\n");
-    }
+my %rep;
+my $i = 0;
+# Index on prj
+foreach my $r (pb_conf_get(@keys)) {
+    $rep{$keys[$i]} = $r->{'default'} if (defined  $r->{'default'});
+    $rep{$keys[$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(@keys))) {
+    $rep{$keys[$i]} = $r if (defined $keys[$i]);
+    $i++;
+}
+foreach my $r (keys %rep) {
+    print "$r => " if (defined $ldebug);
+    print "$rep{$r}\n";
 }
 }