Changeset 1154

Timestamp:

01/12/11 03:11:38 (2 years ago)

Author:

bruno

Message:

• Let time to VM to be killed before launching a new one
• Target build dir needs to be in dir/ver/arch to allow real build

File:

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

devel/pb/bin/pb

@@ -1763 +1763 @@
 
         $src =~ s/^ *//;
-        pb_mkdir_p("$ENV{'PBBUILDDIR'}/$odir/$over");
+        pb_mkdir_p("$ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
         # Change pgben to make the next send2target happy
         my $made = "";
@@ -1777 +1777 @@
         foreach my $p (split(/ +/,$src)) {
             my $j = basename($p);
-            pb_system("$cpcmd $cp2target/$delim$p$delim $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Recovery of package $j in $ENV{'PBBUILDDIR'}/$odir/$over");
+            pb_system("$cpcmd $cp2target/$delim$p$delim $ENV{'PBBUILDDIR'}/$odir/$over/$oarch 2> /dev/null","Recovery of package $j in $ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
             $made="$made $odir/$over/$j"; # if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
         }
@@ -1797 +1797 @@
         pb_log(2,"Before sending pkgs, vmexist: $vmexist, vmpid: $vmpid\n");
         pb_send2target("Packages",$odir."-".$over."-".$oarch,$vmexist,$vmpid);
-        pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
+        pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
     }
     unlink("$ENV{'PBDESTDIR'}/pbscript.$$") if ($cmt =~ /^V[ME]/);
@@ -2026 +2026 @@
                     pb_log(0,"WARNING: Killing the process ($vmssh) using port $nport (previous failed VM ?)\n");
                     kill 15,$vmssh;
+                    # Let it time to exit
+                    sleep 5;
                 }
                 pb_system("$cmd &","Launching the VM $vmm");