Changeset 1595 in ProjectBuilder for devel/pb

Timestamp:

May 24, 2012, 10:54:48 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb_system is back to 3 params, as the previously undocumented "mayfail" 3rd parameter povides what the 4th was dded for. callers adapted in relationship

Location:

devel/pb

Files:

• bin/pb (modified) (6 diffs)
• t/pbtest (modified) (1 diff)

devel/pb/bin/pb

@@ -1751 +1751 @@
             $cmd .= " $chkopt" if (defined $chkopt);
             $cmd .= " $made";
-            my $ret = pb_system("$cmd","Checking validity of rpms with $chkcmd","verbose",1);
+            my $ret = pb_system("$cmd","Checking validity of rpms with $chkcmd","mayfail");
             pb_log(0,"ERROR: when checking packages validity\n") if ($ret ne 0);
         }
@@ -1768 +1768 @@
         }
         if (-x $chkcmd) {
-            my $ret = pb_system("$chkcmd $chkopt $made2","Checking validity of debs with $chkcmd","verbose",1);
+            my $ret = pb_system("$chkcmd $chkopt $made2","Checking validity of debs with $chkcmd","mayfail");
             pb_log(0,"ERROR: when checking packages validity\n") if ($ret ne 0);
         }
@@ -2279 +2279 @@
         my $ftpput = pb_check_req("ncftpput",1);
         my $ftpget = pb_check_req("wget",1);
-        my ($cpanuser,$cpanpasswd) = pb_conf_get("cpanuser","cpanpasswd");
+        my ($cpanuser,$cpanpasswd) = pb_conf_get_if("cpanuser","cpanpasswd");
+        return if ((not defined $cpanuser) || (not defined $cpanuser->{$ENV{'PBPROJ'}}));
+        return if ((not defined $cpanpasswd) || (not defined $cpanpasswd->{$ENV{'PBPROJ'}}));
         my ($cpansubdir) = pb_conf_get_if("cpansubdir");
-        $shcmd = "$ftpget --post-data \'HIDDENNAME=".$cpanuser;
-        $shcmd .= "&user=".$cpanuser;
-        $shcmd .= "&password=".$cpanpasswd;
+        $shcmd = "$ftpget --post-data \'HIDDENNAME=".$cpanuser->{$ENV{'PBPROJ'}};
+        $shcmd .= "&user=".$cpanuser->{$ENV{'PBPROJ'}};
+        $shcmd .= "&password=".$cpanpasswd->{$ENV{'PBPROJ'}};
         $shcmd .= "&SUBMIT_pause99_add_uri_upload=\"Upload the checked files\"";
-        $shcmd .= "&pause99_add_uri_subdirtext=".$cpansubdir if (defined $cpansubdir);
+        $shcmd .= "&pause99_add_uri_subdirtext=".$cpansubdir->{$ENV{'PBPROJ'}} if ((defined $cpansubdir) && (defined $cpansubdir->{$ENV{'PBPROJ'}}));
         foreach my $s (split(/ /,$src)) {
             $shcmd .= "&pause99_add_uri_upload=".basename($s);
@@ -2316 +2318 @@
     # For VE we need to change the owner manually
     if ($cmt =~ /^VE/) {
-        if (defined $shcmdroot) {
-            # This should help overcome a CentOS 5.8 bug as well as having a simper sequence
-            pb_system("$shcmdroot chown -R $mac $tdir","Adapt owner in $tdir to $mac");
-        } else {
-            pb_system("$shcmd \"sudo chown -R $mac $tdir\"","Adapt owner in $tdir to $mac");
-        }
+        pb_system("$shcmdroot sed -i '/requiretty/d' /etc/sudoers","Removing potential requiretty in sudoers");
+        pb_system("$shcmd \"sudo chown -R $mac $tdir\"","Adapt owner in $tdir to $mac");
     }
 
@@ -2631 +2629 @@
                 pb_system("$cmd &","Launching the VM $vmm");
                 # Using system allows to kill it externaly if needed,sosupport that in the call
-                pb_system("sleep $ENV{'PBVMTMOUT'}","Waiting $ENV{'PBVMTMOUT'} s for VM $v to come up",undef,1);
+                pb_system("sleep $ENV{'PBVMTMOUT'}","Waiting $ENV{'PBVMTMOUT'} s for VM $v to come up","mayfail");
                 $vmpid = pb_check_ps($tmpcmd,$vmm);
                 pb_log(0,"VM $vmm launched (pid $vmpid)\n");
@@ -4331 +4329 @@
     }
     my $debsigncmd = pb_check_req("debsign",1);
-    pb_system("$debsigncmd -m\'$ENV{'PBPACKAGER'}\' $changes","Signing DEB packages",undef,1) if (($changes ne "") && (defined $debsigncmd));
+    pb_system("$debsigncmd -m\'$ENV{'PBPACKAGER'}\' $changes","Signing DEB packages","mayfail") if (($changes ne "") && (defined $debsigncmd));
 } else {
     pb_log(0,"I don't know yet how to sign packages for type $pbos->{'type'}.\nPlease give feedback to dev team\n");

devel/pb/t/pbtest

@@ -59 +59 @@
 sudocmd "killall -u pbtest"
 sudocmd "userdel pbtest"
-sudocmd "groupdel pbtest"
+#sudocmd "groupdel pbtest" 1
 sudocmd "useradd pbtest"
 sudocmd "grep -q pbtest /etc/sudoers"