Changeset 1550 in ProjectBuilder

Timestamp:

May 21, 2012, 2:32:38 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb: import cluck (for debugging, not in active use). Add the "all ok" logic to all of the uses of Parallel::ForkManager. I tried to do pb cmd && pb cmd && pb cmd, the second one failed so the third just threw tons of errors. Add -e to all the bash invocations so they will properly report back errors. Increase the complexity of my workaround for centos5.8 sudoers problem. This one works (But maybe not again with Bruno's adaptation !). (Eric Andersson)

File:

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

devel/pb/bin/pb

@@ -17 +17 @@
 # in their respective section
 use Getopt::Long qw(:config auto_abbrev no_ignore_case);
+use Carp 'cluck';
 use Data::Dumper;
 use English;
@@ -1062 +1063 @@
 
             # Try to use // processing here
+            my $all_ok = 1;
             my $pm = new Parallel::ForkManager($pbparallel) if (defined $pbparallel);
+            $pm->run_on_finish(sub { my ($pid, $code, $id, $signal, $dump) = @_;
+                                    $all_ok = 0 unless (($code == 0) && ($signal == 0) && ($dump == 0)); });
 
             pb_log(0,"Preparing delivery ...\n");
@@ -1189 +1193 @@
             # In the parent, we need to get the result from the children
             $pm->wait_all_children if (defined $pbparallel);
+            die "Aborting, one or more of the children failed." if ((not $all_ok) && ($Global::pb_stop_on_error));
             my $made = "";
             my %h = ();
@@ -1702 +1707 @@
             $made .= " ".pb_get_content($f);
         }
-        die "Aborting, one or more of the children failed.\n" if ((not $all_ok) && ($Global::pb_stop_on_error));
+        die "Aborting, one or more of the children failed." if ((not $all_ok) && ($Global::pb_stop_on_error));
         pb_rm_rf($tmpd);
     }
@@ -2250 +2255 @@
     # Do not touch when just announcing
     if (($cmt ne "Announce") && ($cmt ne "CPAN")) {
-        pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | bash\"","Preparing $tdir on $cptarget");
+        pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | bash-e\"","Preparing $tdir on $cptarget");
     } else {
         $logres = "> ";
@@ -2645 +2650 @@
 my ($vmexist,$vmpid) = (undef,undef);
 my $pm;
+my $all_ok = 1;
 if (defined $pbparallel) {
     $pm = new Parallel::ForkManager($pbparallel);
@@ -2650 +2656 @@
     # Set which port the VM/RM will use to communicate
     $pm->run_on_start(\&pb_set_port);
+    $pm->run_on_finish(sub { my ($pid, $code, $id, $signal, $dump) = @_;
+                            unless ($code == 0 && $signal == 0 && $dump == 0) {
+                                pb_log(0,"ERROR: pid $pid failed\n");
+                            }
+                        });
 }
 
@@ -2776 +2787 @@
 }
 $pm->wait_all_children if (defined $pbparallel);
+die "Aborting, one or more of the children failed." if ((not $all_ok) && ($Global::pb_stop_on_error));
 }
 
@@ -2942 +2954 @@
 
 my $pm;
+my $all_ok = 1;
 if (defined $pbparallel) {
     $pm = new Parallel::ForkManager($pbparallel);
@@ -2947 +2960 @@
     # Set which port the VM/RM will use to communicate
     $pm->run_on_start(\&pb_set_port);
+    $pm->run_on_finish(sub { my ($pid, $code, $id, $signal, $dump) = @_;
+                            $all_ok = 0 unless (($code == 0) && ($signal == 0) && ($dump == 0)); 
+                        });
 }
 
@@ -3315 +3331 @@
     my $dir = $m;
     $dir =~ s/-.*//;
-    pb_system("echo \"rm -rf $m* ; wget http://search.cpan.org/CPAN/modules/by-module/$dir/$m-$osperlver->{$m}.tar.gz ; gzip -cd $m-$osperlver->{$m}.tar.gz | tar xf - ; cd $m* ; if [ -f Build.PL ]; then perl Build.PL; ./Build ; ./Build install ; else perl Makefile.PL; make ; make install ; fi; cd .. ; rm -rf $m*\" | bash" ,"Installing perl module $m-$osperlver->{$m}");
+    pb_system("echo \"rm -rf $m* ; wget http://search.cpan.org/CPAN/modules/by-module/$dir/$m-$osperlver->{$m}.tar.gz ; gzip -cd $m-$osperlver->{$m}.tar.gz | tar xf - ; cd $m* ; if [ -f Build.PL ]; then perl Build.PL; ./Build ; ./Build install ; else perl Makefile.PL; make ; make install ; fi; cd .. ; rm -rf $m*\" | bash -e" ,"Installing perl module $m-$osperlver->{$m}");
 }
 EOF
@@ -3402 +3418 @@
 }
 $pm->wait_all_children if (defined $pbparallel);
+die "Aborting, one or more of the children failed." if ((not $all_ok) && ($Global::pb_stop_on_error));
 return;
 }