Changeset 1137 in ProjectBuilder for devel/pb-modules

Timestamp:

Jan 7, 2011, 12:37:04 AM (13 years ago)

Author:

Bruno Cornec

Message:

• build2pkg is now using Parallel::ForkManager to generate packages in parallel
• pb_system fixed to support parallel calls

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Base.pm (modified) (3 diffs)
• Distribution.pm (modified) (1 diff)

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

@@ -146 +146 @@
 pb_log(0,"$cmt... ") if ((! defined $verbose) || ($verbose ne "quiet"));
 pb_log(1,"Executing $cmd\n");
-unlink("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
-$redir = "2>> $ENV{'PBTMP'}/system.log 1>> $ENV{'PBTMP'}/system.log" if ((! defined $verbose) || ($verbose ne "noredir"));
+unlink("$ENV{'PBTMP'}/system.$$.log") if (-f "$ENV{'PBTMP'}/system.$$.log");
+$redir = "2>> $ENV{'PBTMP'}/system.$$.log 1>> $ENV{'PBTMP'}/system.$$.log" if ((! defined $verbose) || ($verbose ne "noredir"));
 system("$cmd $redir");
 my $res = $?;
@@ -158 +158 @@
 if ($res == -1) {
     pb_log(0,"failed to execute ($cmd): $!\n") if ((! defined $verbose) || ($verbose ne "quiet"));
-    pb_display_file("$ENV{'PBTMP'}/system.log") if ((-f "$ENV{'PBTMP'}/system.log") and ((! defined $verbose) || ($verbose ne "quiet")));
+    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet")));
 } elsif ($res & 127) {
     pb_log(0, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n") if ((! defined $verbose) || ($verbose ne "quiet"));
-    pb_display_file("$ENV{'PBTMP'}/system.log") if ((-f "$ENV{'PBTMP'}/system.log") and ((! defined $verbose) || ($verbose ne "quiet")));
+    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet")));
 } elsif ($res == 0) {
     pb_log(0,"OK\n") if ((! defined $verbose) || ($verbose ne "quiet"));
-    pb_display_file("$ENV{'PBTMP'}/system.log") if ((defined $verbose) and (-f "$ENV{'PBTMP'}/system.log") and ($verbose ne "quiet"));
+    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((defined $verbose) and (-f "$ENV{'PBTMP'}/system.$$.log") and ($verbose ne "quiet"));
 } else {
     pb_log(0, "child ($cmd) exited with value ".($? >> 8)."\n") if ((! defined $verbose) || ($verbose ne "quiet"));
-    pb_display_file("$ENV{'PBTMP'}/system.log") if ((-f "$ENV{'PBTMP'}/system.log") and ((! defined $verbose) || ($verbose ne "quiet")));
+    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet")));
 }
 return($res);
@@ -312 +312 @@
 =item B<pb_set_content>
 
-This function put the content of a file into the file passed in parameter.
+This function put the content of a variable passed as second parameter into the file passed as first parameter.
 
 =cut

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

@@ -302 +302 @@
 return if ((not defined $deps) || ($deps =~ /^\s*$/));
 if ($deps !~ /^[    ]*$/) {
+    # This may not be // proof. We should test for availability of repo and sleep if not
     pb_system("$dupd $deps","Installing dependencies ($deps)");
     }