Changeset 1388 in ProjectBuilder

Timestamp:

Jan 7, 2012, 8:13:19 PM (12 years ago)

Author:

Bruno Cornec

Message:

• VE build now propagates params instead of forcing no snapshot e.g.

File:

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

devel/pb/bin/pb

@@ -1936 +1936 @@
 echo "Architecture: Source" >> dists/$pbos->{'version'}/contrib/source/Release
 echo "Creating Release metadata"
+# Signing that file would be useful but uneasy as gpg keys are not there
+# Cf: http://wiki.debian.org/SecureApt
+# Same as for repomd
 apt-ftparchive release dists/$pbos->{'version'} > dists/$pbos->{'version'}/Release
 rm -rf \$TMPD
@@ -2055 +2058 @@
     }
     my $cmdverb = "verbose";
-    if (($cmt ne "Announce") && ($cmt ne "CPAN")) {
+    if (($cmt eq "Announce") || ($cmt eq "CPAN")) {
         $cmdverb = undef;
     }
@@ -2349 +2352 @@
     } elsif ($vtype eq "ve") {
         # Force the creation of the VE and no snapshot usable
-        pb_ve_launch($v,1,0);
+        pb_ve_launch($v,$create,$usesnap);
     } else {
         # RM here
@@ -3419 +3422 @@
                 # Skip as excluded
                 next if ($found == 1);
-                # Avoid duplicates
+                pb_log(0,"Package NOT found for $t\n");
+                # Avoid duplicates in list
                 next if ($vmbuildlist =~ /$os-$ver-$arch/);
                 next if ($vebuildlist =~ /$os-$ver-$arch/);
                 next if ($rmbuildlist =~ /$os-$ver-$arch/);
-                pb_log(0,"Package NOT found for $t\n");
                 # check with which method we need to build
                 if ((defined $pt[0]->{$ENV{'PBPROJ'}}) and ($pt[0]->{$ENV{'PBPROJ'}} =~ /$os-$ver-$arch/)) {
                     $vmbuildlist = "$os-$ver-$arch" if ($vmbuildlist eq "");
-                    $vmbuildlist .= ",$os-$ver-$arch";
+                    $vmbuildlist .= ",$os-$ver-$arch" if ($vmbuildlist !~ /$os-$ver-$arch/);
+                    next;
                 }
                 if ((defined $pt[1]->{$ENV{'PBPROJ'}}) and ($pt[1]->{$ENV{'PBPROJ'}} =~ /$os-$ver-$arch/)) {
                     $vebuildlist = "$os-$ver-$arch" if ($vebuildlist eq "");
-                    $vebuildlist .= ",$os-$ver-$arch";
+                    $vebuildlist .= ",$os-$ver-$arch" if ($vebuildlist !~ /$os-$ver-$arch/);
+                    next;
                 }
                 if ((defined $pt[2]->{$ENV{'PBPROJ'}}) and ($pt[2]->{$ENV{'PBPROJ'}} =~ /$os-$ver-$arch/)) {
                     $rmbuildlist = "$os-$ver-$arch" if ($rmbuildlist eq "");
-                    $rmbuildlist .= ",$os-$ver-$arch";
+                    $rmbuildlist .= ",$os-$ver-$arch" if ($rmbuildlist !~ /$os-$ver-$arch/);
                 }
             }
@@ -3848 +3853 @@
     if ($@) {
         # Linux::SysInfo not found
-        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");
+        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");
     } else {
         # Using the memory size
         my $si = Linux::SysInfo::sysinfo();
         if (not defined $si) {
-            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");
+            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");
         } else {
             # Keep the number of VM whose memory can be allocated