Changeset 1388


Ignore:
Timestamp:
Jan 7, 2012, 8:13:19 PM (8 years ago)
Author:
bruno
Message:
  • VE build now propagates params instead of forcing no snapshot e.g.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r1386 r1388  
    19361936echo "Architecture: Source" >> dists/$pbos->{'version'}/contrib/source/Release
    19371937echo "Creating Release metadata"
     1938# Signing that file would be useful but uneasy as gpg keys are not there
     1939# Cf: http://wiki.debian.org/SecureApt
     1940# Same as for repomd
    19381941apt-ftparchive release dists/$pbos->{'version'} > dists/$pbos->{'version'}/Release
    19391942rm -rf \$TMPD
     
    20552058    }
    20562059    my $cmdverb = "verbose";
    2057     if (($cmt ne "Announce") && ($cmt ne "CPAN")) {
     2060    if (($cmt eq "Announce") || ($cmt eq "CPAN")) {
    20582061        $cmdverb = undef;
    20592062    }
     
    23492352    } elsif ($vtype eq "ve") {
    23502353        # Force the creation of the VE and no snapshot usable
    2351         pb_ve_launch($v,1,0);
     2354        pb_ve_launch($v,$create,$usesnap);
    23522355    } else {
    23532356        # RM here
     
    34193422                # Skip as excluded
    34203423                next if ($found == 1);
    3421                 # Avoid duplicates
     3424                pb_log(0,"Package NOT found for $t\n");
     3425                # Avoid duplicates in list
    34223426                next if ($vmbuildlist =~ /$os-$ver-$arch/);
    34233427                next if ($vebuildlist =~ /$os-$ver-$arch/);
    34243428                next if ($rmbuildlist =~ /$os-$ver-$arch/);
    3425                 pb_log(0,"Package NOT found for $t\n");
    34263429                # check with which method we need to build
    34273430                if ((defined $pt[0]->{$ENV{'PBPROJ'}}) and ($pt[0]->{$ENV{'PBPROJ'}} =~ /$os-$ver-$arch/)) {
    34283431                    $vmbuildlist = "$os-$ver-$arch" if ($vmbuildlist eq "");
    3429                     $vmbuildlist .= ",$os-$ver-$arch";
     3432                    $vmbuildlist .= ",$os-$ver-$arch" if ($vmbuildlist !~ /$os-$ver-$arch/);
     3433                    next;
    34303434                }
    34313435                if ((defined $pt[1]->{$ENV{'PBPROJ'}}) and ($pt[1]->{$ENV{'PBPROJ'}} =~ /$os-$ver-$arch/)) {
    34323436                    $vebuildlist = "$os-$ver-$arch" if ($vebuildlist eq "");
    3433                     $vebuildlist .= ",$os-$ver-$arch";
     3437                    $vebuildlist .= ",$os-$ver-$arch" if ($vebuildlist !~ /$os-$ver-$arch/);
     3438                    next;
    34343439                }
    34353440                if ((defined $pt[2]->{$ENV{'PBPROJ'}}) and ($pt[2]->{$ENV{'PBPROJ'}} =~ /$os-$ver-$arch/)) {
    34363441                    $rmbuildlist = "$os-$ver-$arch" if ($rmbuildlist eq "");
    3437                     $rmbuildlist .= ",$os-$ver-$arch";
     3442                    $rmbuildlist .= ",$os-$ver-$arch" if ($rmbuildlist !~ /$os-$ver-$arch/);
    34383443                }
    34393444            }
     
    38483853    if ($@) {
    38493854        # Linux::SysInfo not found
    3850         pb_log(1,"ADVISE: Install Linux::SysInfo to benefit from automatic parallelism optimization.\nOr optimize manually pbparallel in your pb.conf file\nUsing $pbparallel processes max at a time for the moment\nWARNING: This may consume too much memory for your system");
     3855        pb_log(1,"ADVISE: Install Linux::SysInfo to benefit from automatic parallelism optimization.\nOr optimize manually pbparallel in your pb.conf file\nUsing $pbparallel processes max at a time for the moment\nWARNING: This may consume too much memory for your system\n");
    38513856    } else {
    38523857        # Using the memory size
    38533858        my $si = Linux::SysInfo::sysinfo();
    38543859        if (not defined $si) {
    3855             pb_log(1,"ADVISE: Install Linux::SysInfo to benefit from automatic parallelism optimization.\nOr optimize manually pbparallel in your pb.conf file\nUsing $pbparallel processes max at a time for the moment\nWARNING: This may consume too much memory for your system");
     3860            pb_log(1,"ADVISE: Install Linux::SysInfo to benefit from automatic parallelism optimization.\nOr optimize manually pbparallel in your pb.conf file\nUsing $pbparallel processes max at a time for the moment\nWARNING: This may consume too much memory for your system\n");
    38563861        } else {
    38573862            # Keep the number of VM whose memory can be allocated
Note: See TracChangeset for help on using the changeset viewer.