Changeset 2139 in ProjectBuilder for devel

Timestamp:

Sep 11, 2016, 1:16:52 AM (8 years ago)

Author:

Bruno Cornec

Message:

Adding function pb_filter_var_print to enhance pb as per #148

Location:

devel/pb

Files:

• bin/pb (modified) (2 diffs)
• lib/ProjectBuilder/Filter.pm (modified) (2 diffs)

devel/pb/bin/pb

@@ -441 +441 @@
 Print the full configuration parameters as found in the various configuration files. Help to debug conf issues.
 Also accepts a parameter to display only this value, and a VM/VE/RM
+
+=item B<getvar>
+
+Print the full variables expanded based on the distrubution tuple. Help to debug conf issues.
+Also accepts a parameter to display only the values for this package, and a VM/VE/RM
 
 =item B<clean>
@@ -983 +988 @@
     pb_log(1,"Arguments to print:".Dumper(@ARGV)."\n");
     pb_distro_conf_print($pbos,@ARGV);
+} elsif ($action =~ /^getvar$/) {
+    my $pbos = pb_distro_get_context($ENV{'PBV'});
+    my $pkg;
+    my @pkg;
+    if ($#ARGV == -1) {
+        $pkg = pb_cms_get_pkg($defpkgdir,$extpkgdir);
+        @pkgs = @$pkg;
+    } else {
+        @pkgs = @ARGV;
+    }
+    pb_log(1,"Packages to print:".Dumper(@pkgs)."\n");
+    pb_filter_var_print($pbos,@pkgs);
 } elsif ($action =~ /^clean$/) {
     pb_clean();

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -34 +34 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_get_filters pb_filter_file_pb pb_filter_file_inplace pb_filter_file);
+our @EXPORT = qw(pb_get_filters pb_filter_file_pb pb_filter_file_inplace pb_filter_file pb_filter_var_print);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -263 +263 @@
 
 
+=item B<pb_filter_var_print>
+
+This function prints every variable expanded in order to help debug stacking issues with conf files. If a VM/VE/RM is given restrict display to this distribution. If parameters are passed, restrict again the display to that package only.
+
+=cut
+
+sub pb_filter_var_print {
+
+my $pbos = shift;
+my @keys = @_;
+my $ptr = undef;
+
+if ($#keys == -1) {
+    pb_log(0,"Full pb variables for project $ENV{'PBPROJ'}\n");
+    pb_log(0,"============================================\n");
+}
+if (defined $ENV{'PBV'}) {
+    pb_log(0,"Distribution $ENV{'PBV'}\n");
+    pb_log(0,"========================\n");
+} else {
+    pb_log(0,"Local Distribution\n");
+    pb_log(0,"==================\n");
+}
+
+foreach my $k (@keys) {
+    $ptr = pb_get_filters($k,$pbos);
+    pb_log(0,"Package $k\n");
+    pb_log(0,"==================\n");
+    foreach my $f (sort keys %$ptr) {
+        pb_log(0,"Filter $f => $ptr->{$f}\n");
+    }
+    pb_log(0,"==================\n");
+}
+}
+
+
 =back