- Timestamp:
- Jan 7, 2012, 8:13:19 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r1386 r1388 1936 1936 echo "Architecture: Source" >> dists/$pbos->{'version'}/contrib/source/Release 1937 1937 echo "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 1938 1941 apt-ftparchive release dists/$pbos->{'version'} > dists/$pbos->{'version'}/Release 1939 1942 rm -rf \$TMPD … … 2055 2058 } 2056 2059 my $cmdverb = "verbose"; 2057 if (($cmt ne "Announce") && ($cmt ne"CPAN")) {2060 if (($cmt eq "Announce") || ($cmt eq "CPAN")) { 2058 2061 $cmdverb = undef; 2059 2062 } … … 2349 2352 } elsif ($vtype eq "ve") { 2350 2353 # Force the creation of the VE and no snapshot usable 2351 pb_ve_launch($v, 1,0);2354 pb_ve_launch($v,$create,$usesnap); 2352 2355 } else { 2353 2356 # RM here … … 3419 3422 # Skip as excluded 3420 3423 next if ($found == 1); 3421 # Avoid duplicates 3424 pb_log(0,"Package NOT found for $t\n"); 3425 # Avoid duplicates in list 3422 3426 next if ($vmbuildlist =~ /$os-$ver-$arch/); 3423 3427 next if ($vebuildlist =~ /$os-$ver-$arch/); 3424 3428 next if ($rmbuildlist =~ /$os-$ver-$arch/); 3425 pb_log(0,"Package NOT found for $t\n");3426 3429 # check with which method we need to build 3427 3430 if ((defined $pt[0]->{$ENV{'PBPROJ'}}) and ($pt[0]->{$ENV{'PBPROJ'}} =~ /$os-$ver-$arch/)) { 3428 3431 $vmbuildlist = "$os-$ver-$arch" if ($vmbuildlist eq ""); 3429 $vmbuildlist .= ",$os-$ver-$arch"; 3432 $vmbuildlist .= ",$os-$ver-$arch" if ($vmbuildlist !~ /$os-$ver-$arch/); 3433 next; 3430 3434 } 3431 3435 if ((defined $pt[1]->{$ENV{'PBPROJ'}}) and ($pt[1]->{$ENV{'PBPROJ'}} =~ /$os-$ver-$arch/)) { 3432 3436 $vebuildlist = "$os-$ver-$arch" if ($vebuildlist eq ""); 3433 $vebuildlist .= ",$os-$ver-$arch"; 3437 $vebuildlist .= ",$os-$ver-$arch" if ($vebuildlist !~ /$os-$ver-$arch/); 3438 next; 3434 3439 } 3435 3440 if ((defined $pt[2]->{$ENV{'PBPROJ'}}) and ($pt[2]->{$ENV{'PBPROJ'}} =~ /$os-$ver-$arch/)) { 3436 3441 $rmbuildlist = "$os-$ver-$arch" if ($rmbuildlist eq ""); 3437 $rmbuildlist .= ",$os-$ver-$arch" ;3442 $rmbuildlist .= ",$os-$ver-$arch" if ($rmbuildlist !~ /$os-$ver-$arch/); 3438 3443 } 3439 3444 } … … 3848 3853 if ($@) { 3849 3854 # 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"); 3851 3856 } else { 3852 3857 # Using the memory size 3853 3858 my $si = Linux::SysInfo::sysinfo(); 3854 3859 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"); 3856 3861 } else { 3857 3862 # Keep the number of VM whose memory can be allocated
Note:
See TracChangeset
for help on using the changeset viewer.