Changeset 2488 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Mar 30, 2020, 8:21:44 PM (4 years ago)

Author:

Bruno Cornec

Message:

Improve debug messages

• pb_distro_get_param now an internal function printing name of hash members
• use pb_distro_guess instead of pb_distro_get
• pb_distro_get and pb_distro_get_if introduced to replace call to pb_conf_get(_if)* + and old pb_distro_get_param
• add pb_distro_get_in_conf_if for another use case of old pb_distro_get_param
• fix all calls to these functions

File:

• devel/pb/bin/pb (modified) (15 diffs)

devel/pb/bin/pb

@@ -1396 +1396 @@
                         my ($patchcmd,$patchopt);
                         if ($pbos->{'type'} eq "deb") {
-                            ($patchcmd,$patchopt) = pb_distro_get_param($pbos,pb_conf_get_if("ospatchcmd","ospatchopt"));
+                            ($patchcmd,$patchopt) = pb_distro_get_if($pbos,("ospatchcmd","ospatchopt"));
                             open(SCRIPT,"> $dest/pbconf/$v/pbpatch/pbapplypatch") || confess "Unable to create $dest/pbconf/$v/pbpatch/pbapplypatch";
                             print SCRIPT "#!/bin/bash\n";
@@ -2094 +2094 @@
 
     # Find the appropriate check cmd/opts
-    my ($chkcmd,$chkopt) = pb_distro_get_param($pbos,pb_conf_get_if("oschkcmd","oschkopt"));
+    my ($chkcmd,$chkopt) = pb_distro_get_if($pbos,("oschkcmd","oschkopt"));
 
     my $ret = "";
@@ -2329 +2329 @@
     }
     if ($cmt =~ /^(V|R)M/) {
-        $vtmout = pb_distro_get_param($pbos,pb_conf_get_if($tmout));
+        $vtmout = pb_distro_get_if($pbos,$tmout);
     }
     my $remhost = $sshhost->{$ENV{'PBPROJ'}};
@@ -2335 +2335 @@
     if ($cmt =~ /^V[EM]|RM/) {
         # In that case our real host is in the xxhost with the OS as key, not project as above
-        $remhost = pb_distro_get_param($pbos,$sshhost);
+        $remhost = pb_distro_get($pbos,$host);
     }
     pb_log(2,"ssh: ".Dumper(($remhost,$sshlogin,$remdir,$sshport,$vepath,$rbsconf))."\n");
@@ -2393 +2393 @@
         open(PBS,"> $pbscript{$v}") || confess "Unable to create $pbscript{$v}";
         if ($pbos->{'type'} eq "rpm") {
-            my $pbsha = pb_distro_get_param($pbos,pb_conf_get("ossha"));
+            my $pbsha = pb_distro_get($pbos,"ossha");
             my ($gpgcheck) = pb_conf_get_if("pbgpgcheck");
             my $pbgpgcheck;
@@ -2858 +2858 @@
     if ($cmt =~ /^VE/) {
         if ($vetype ne "docker") {
-            my $sudomode = pb_distro_get_param($pbos,pb_conf_get("ossudoersmode"));
+            my $sudomode = pb_distro_get($pbos,"ossudoersmode");
             my $res = pb_system("$shcmdroot sed -i '/requiretty/d' /etc/sudoers","Removing potential requiretty in sudoers","quiet");
             pb_system("$shcmdroot sed '/requiretty/d' /etc/sudoers > /tmp/sudoers.new ; mv /tmp/sudoers.new $tpdir/tmp/sudoers.new ; $shcmdroot mv /tmp/sudoers.new /etc/sudoers ; $shcmdroot chown root:root /etc/sudoers ; $shcmdroot chmod $sudomode /etc/sudoers","Removing again potential requiretty in sudoers as sed -i failed") if (($res ne 0) && (-f "$tpdir/etc/sudoers"));
@@ -3053 +3053 @@
         }
         my $hoption = "-p";
-        my $hpath = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-halt"));
+        my $hpath = pb_distro_get($pbos,"ospathcmd-halt");
         # Solaris doesn't support -p of halt
         if ($pbos->{'type'} eq "pkg") {
@@ -3211 +3211 @@
 # Launch the VMs/VEs
 if ($vtype eq "vm") {
-    my ($ptr,$ptr2,$vmpath,$vmport,$vms) = pb_conf_get("vmtype","vmcmd","vmpath","vmport","vmsize");
-    my ($vmopt,$vmmm,$vmtmout,$vmsnap,$vmbuildtm,$vmmonport) = pb_conf_get_if("vmopt","vmmem","vmtmout","vmsnap","vmbuildtm","vmmonport");
-    my $vmsize = pb_distro_get_param($pbos,$vms);
+    my ($ptr,$ptr2,$vmpath,$vmport) = pb_conf_get("vmtype","vmcmd","vmpath","vmport");
+    my ($vmopt,$vmtmout,$vmsnap,$vmbuildtm,$vmmonport) = pb_conf_get_if("vmopt","vmtmout","vmsnap","vmbuildtm","vmmonport");
+    my $vmsize = pb_distro_get($pbos,"vmsize");
 
     my $vmtype = $ptr->{$ENV{'PBPROJ'}};
@@ -3236 +3236 @@
 
     # How much memory to allocate for VMs
-    if (defined $vmmm) {
-        my $vmmem = pb_distro_get_param($pbos,$vmmm);
-        if (defined $vmmem) {
-            $ENV{'PBVMOPT'} .= " -m $vmmem";
-        }
+    my $vmmem = pb_distro_get_if($pbos,"vmmem");
+    if (defined $vmmem) {
+        $ENV{'PBVMOPT'} .= " -m $vmmem";
     }
 
@@ -3409 +3407 @@
     pb_log(2,"ntp server is $vntp\n");
     # ntp command depends on pbos
-    my $vntpcmd = pb_distro_get_param($pbos,pb_conf_get("oscmdntp"));
+    my $vntpcmd = pb_distro_get($pbos,"oscmdntp");
     $ntpline = "sudo $vntpcmd $vntp";
 }
@@ -4077 +4075 @@
     # Try to restrict security to what is really needed
     if ($vtype =~ /^vm/) {
-        my $hpath = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-halt"));
+        my $hpath = pb_distro_get($pbos,"ospathcmd-halt");
         my @sudocmds = pb_get_sudocmds($pbos,$ntpline,"sudo $hpath","sudo /bin/date");
         print SCRIPT << "EOF";
@@ -4101 +4099 @@
 EOF
     }
-    my $sudomode = pb_distro_get_param($pbos,pb_conf_get("ossudoersmode"));
+    my $sudomode = pb_distro_get($pbos,"ossudoersmode");
     print SCRIPT << 'EOF';
 close(PBOUT);
@@ -4132 +4130 @@
 
 EOF
-    my $itype = pb_distro_get_param($pbos,pb_conf_get("pbinstalltype"));
+    my $itype = pb_distro_get($pbos,"pbinstalltype");
     # Install from sandbox mean a file base install
     $itype = "file" if (defined $sbx);
     $itype = $installtype if (defined $installtype);
     if ($itype =~ /^file/) {
-        my ($addrepo) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","addbuildrepo");
-        my $pbrepo = pb_distro_get_param($pbos,$addrepo);
+            #my ($addrepo) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","addbuildrepo");
+            #my $pbrepo = pb_distro_get_param($pbos,$addrepo);
+        my $pbrepo = pb_distro_get_in_conf_if($pbos,"$ENV{'PBDESTDIR'}/pbrc.yml","addbuildrepo");
         print SCRIPT << 'EOF';
 
 # First install all required packages
-my ($ospkgdep) = pb_conf_get_if("ospkgdep");
-my $pkgdep = pb_distro_get_param($pbos,$ospkgdep);
+my $pkgdep = pb_distro_get_if($pbos,"ospkgdep");
 my $forcerepo;
 EOF
@@ -4177 +4175 @@
         print SCRIPT << 'EOF';
 # Then install manually the missing perl modules
-my ($osperldep,$osperlver) = pb_conf_get_if("osperldep","osperlver");
+my ($osperlver) = pb_conf_get("osperlver");
     
-my $perldep = pb_distro_get_param($pbos,$osperldep);
+my $osperldep = pb_distro_get_if($pbos,"osperldep");
 my $bashopt = "";
 $bashopt = "-x" if ($pbdebug ge 1);
 my $verbopt = "mayfail";
 $verbopt = "mayfailverbose" if ($pbdebug ge 1);
-foreach my $m (split(/,/,$perldep)) {
+foreach my $m (split(/,/,$osperldep)) {
     # Skip empty deps
     next if ($m =~ /^\s*$/);
@@ -4202 +4200 @@
         # pkg based install. We need to point to the project-builder.org repository
         print SCRIPT << 'EOF';
-my $pkgforpb = pb_distro_get_param($pbos,pb_conf_get_if("ospkg"));
+my $pkgforpb = pb_distro_get_if($pbos,"ospkg");
 my $forcerepo = pb_distro_setuposrepo($pbos);
 pb_distro_installpkgs($pbos,pb_distro_only_deps_needed($pbos,join(' ',split(/,/,$pkgforpb))));