Changeset 971

Timestamp:

02/18/10 18:38:59 (3 years ago)

Author:

bruno

Message:

• First packages built and delivered with deboostrap (solve the shell expansion which should not be done for VE)
• Previous snapshot removed before trying to create a new one to avoid useless extraction

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb/bin/pb (modified) (4 diffs)

devel/pb-modules/etc/pb.conf

@@ -213 +213 @@
 ossuffix mandriva = mdv
 ossuffix lsb = lsb
+#ossuffix rhel = rhel
 #ossuffix centos = el
 

devel/pb/bin/pb

@@ -1083 +1083 @@
     } elsif ($dtype eq "deb") {
         my $made2 = "";
+        foreach my $f (split(/ /,$made)) {
+            $made2 .= "../$f " if ($f =~ /\.changes$/);
+        }
         if (-f "/usr/bin/lintian") {
-            foreach my $f (split(/ /,$made)) {
-                $made2 .= "../$f " if ($f =~ /\.changes$/);
-            }
             pb_system("lintian $made2","Checking validity of debs with lintian","verbose");
         } else {
@@ -1425 +1425 @@
         if ($vetype eq "chroot") {
             $shcmd = "sudo chroot $tpdir /bin/su - $mac -c ";
-            $cpcmd = "sudo cp -r ";
         } elsif ($vetype eq "schroot") {
             $shcmd = "schroot $tp -u $mac -- ";
-            $cpcmd = "sudo cp -r ";
-        }
+        }
+        $cpcmd = "sudo cp -r ";
         # We need to get the home dir of the target account to deliver in the right place
         open(PASS,"$tpdir/etc/passwd") || die "Unable to open $tpdir/etc/passwd";
@@ -1484 +1483 @@
         foreach my $p (split(/ +/,$src)) {
             my $j = basename($p);
-            pb_system("$cpcmd $cp2target/\'$p\' $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Recovery of package $j in $ENV{'PBBUILDDIR'}/$odir/$over");
+            # For VM we don't want shell expansion to hapen locally but remotely
+            my $delim = '\'';
+            if ($cmt =~ /^VEbuild/) {
+                # For VE we need to support shell expansion locally
+                $delim = "";
+            }   
+            pb_system("$cpcmd $cp2target/$delim$p$delim $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Recovery of package $j in $ENV{'PBBUILDDIR'}/$odir/$over");
             $made="$made $odir/$over/$j"; # if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
         }
@@ -2516 +2521 @@
 
 foreach my $v (@$vm) {
+    # Get distro context
+    my ($name,$ver,$darch) = split(/-/,$v);
+    chomp($darch);
+    my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver,$darch);
+    my ($vepath) = pb_conf_get("vepath");
+
+    # Test if an existing snapshot exists and remove it if there is a VE
+    if ((-f "$vepath->{$ENV{'PBPROJ'}}/$ddir-$dver-$darch.tar.gz") &&
+        (! -d "$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch")) {
+            pb_system("sudo rm -f $vepath->{$ENV{'PBPROJ'}}/$ddir-$dver-$darch.tar.gz","Removing previous snapshot $ddir-$dver-$darch.tar.gz");
+    }
+
     # Name of the account to deal with for VM/VE
     # Do not use the one passed potentially with -a