Changeset 274 for devel/pb/bin/pb


Ignore:
Timestamp:
Nov 11, 2007, 2:22:50 AM (12 years ago)
Author:
bruno
Message:
  • Do not continue with VM if something goes wrong
  • Also build on 64 bits VMs when all
File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r273 r274  
    171171    foreach my $pbpkg (@pkgs) {
    172172        $ENV{'PBPKG'} = $pbpkg;
     173        $ENV{'PBVER'} = $pbprojver;
     174        $ENV{'PBTAG'} = $pbprojtag;
    173175        if ((defined $pkgv) && (defined $pkgv->{$pbpkg})) {
    174176            $pbver = $pkgv->{$pbpkg};
     
    400402        } elsif ($dtype eq "deb") {
    401403            chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
    402             pb_system("tar xpfz $src","Extracting sources");
     404            pb_system("tar xfz $src","Extracting sources");
    403405
    404406            chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
     
    612614        my ($vmexist,$vmpid) = pb_launchvm($v,0);
    613615
     616        # Skip that VM if it something went wrong
     617        next if (($vmpid == 0) && ($vmexist ==0));
     618
    614619        # Gather all required files to send them to the VM
    615620        # and launch the build thourgh pbscript
     
    678683        }
    679684        if (! -f "$vmm") {
    680             die "Unable to find VM $vmm";
    681         }
    682         pb_system("$cmd &","Launching the VM $vmm");
    683         pb_system("sleep $vmtmout->{$ENV{'PBPROJ'}}","Waiting for VM $vm to come up");
    684         $vmpid = pb_check_ps($tmpcmd,$vmm);
     685            print "Unable to find VM $vmm\n";
     686        } else {
     687            pb_system("$cmd &","Launching the VM $vmm");
     688            pb_system("sleep $vmtmout->{$ENV{'PBPROJ'}}","Waiting for VM $vm to come up");
     689            $vmpid = pb_check_ps($tmpcmd,$vmm);
     690        }
    685691    } else {
    686692        print "Found an existing VM $vmm (pid $vmexist)\n";
     
    730736        my ($vmexist,$vmpid) = pb_launchvm($v,0);
    731737
     738        # Skip that VM if it something went wrong
     739        next if (($vmpid == 0) && ($vmexist == 0));
     740
    732741        # Gather all required files to send them to the VM
    733742        # and launch the build thourgh pbscript
     
    795804if ((not defined $ENV{'PBVM'}) || ($ENV{'PBVM'} =~ /^all$/)) {
    796805    my ($ptr) = pb_conf_get("vmlist");
    797     $ENV{'PBVM'} = $ptr->{$ENV{'PBPROJ'}};
     806    my $ptr2 = $ptr->{$ENV{'PBPROJ'}};
     807    $ptr2 =~ s/,/_64,/g;
     808    $ptr2 =~ s/$/_64/g;
     809    $ENV{'PBVM'} = "$ptr->{$ENV{'PBPROJ'}},$ptr2";
    798810    $all = 1;
    799811}
     812print $LOG "VMs: $ENV{'PBVM'}\n";
    800813@vm = split(/,/,$ENV{'PBVM'});
    801 print $LOG "VMs: ".join(',',@vm)."\n";
    802814return(\@vm,$all);
    803815}
Note: See TracChangeset for help on using the changeset viewer.