Changeset 1795 in ProjectBuilder

Timestamp:

Nov 3, 2013, 10:24:55 PM (10 years ago)

Author:

Bruno Cornec

Message:

• rename function pb_conf_print into pb_distro_conf_print and place it in the right module to handle distribution input for filtering base on it. pb now uses it

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Conf.pm (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pb/bin/pb (modified) (2 diffs)

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

@@ -399 +399 @@
 }
 
-
-=item B<pb_conf_print>
-
-This function prints every configuration parameter in order to help debug stacking issues with conf files
-
-=cut
-
-sub pb_conf_print {
-
-pb_log(0,"Full pb configuration for project $ENV{'PBPROJ'}\n");
-pb_log(0,"====================================\n");
-foreach my $k (pb_conf_get_all()) {
-    pb_log(0,"$k => ".Dumper($h->{$k})."\n");
-}
-}
 =back 
 

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

@@ -33 +33 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_apply_conf_proxy);
+our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_distro_conf_print pb_apply_conf_proxy);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -709 +709 @@
 }
 
+=item B<pb_distro_conf_print>
+
+This function prints every configuration parameter in order to help debug stacking issues with conf files. If a VM/VE/RM is given restrict display to this distribution. Ifparameters are passed, restrict again the display to these values only.
+
+=cut
+
+sub pb_distro_conf_print {
+
+my $pbos = shift;
+my @keys = @_;
+
+if ($#keys == -1) {
+    pb_log(0,"Full pb configuration 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");
+}
+
+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");
+    }
+}
+}
+
+
 =back 
 

devel/pb/bin/pb

@@ -417 +417 @@
 =item B<getconf>
 
-Print the full configuration parameters as found in the various configuration files. help to debug conf issues.
+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<clean>
@@ -946 +947 @@
     # Nothing to do - already done in pb_env_init
 } elsif ($action =~ /^getconf$/) {
-    my $pbos = pb_distro_get_context();
-    pb_conf_print();
+    my $pbos = pb_distro_get_context($ENV{'PBV'});
+    pb_log(1,"Arguments to print:".Dumper(@ARGV)."\n");
+    pb_distro_conf_print($pbos,@ARGV);
 } elsif ($action =~ /^clean$/) {
     pb_clean();