Changeset 1963 in ProjectBuilder

Timestamp:

May 12, 2015, 12:07:15 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix pb install support on Debian 8
• Do not setup ssh when creating VM
• Adds a pb_move_extracted_files function to handle debian subdir case

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -591 +591 @@
 osperldep deb = 
 ospkgdep deb = wget,patch,dpkg-dev,make,debian-builder,dh-make,fakeroot,ntpdate,libfile-mimeinfo-perl,libmodule-build-perl,libdate-manip-perl,libmail-sendmail-perl,diffutils
-ospkgdep debian-8 = wget,patch,dpkg-dev,make,debian-builder,dh-make,fakeroot,ntpdate,libfile-mimeinfo-perl,libmodule-build-perl,libdate-manip-perl,libmail-sendmail-perl,diff
+ospkgdep debian-8 = wget,patch,dpkg-dev,make,debian-builder,dh-make,fakeroot,ntpdate,libfile-mimeinfo-perl,libmodule-build-perl,libdate-manip-perl,libmail-sendmail-perl,diffutils
 ospkgdep debian-7 = wget,patch,dpkg-dev,make,debian-builder,dh-make,fakeroot,ntpdate,libfile-mimeinfo-perl,libmodule-build-perl,libdate-manip-perl,libmail-sendmail-perl,diff
 ospkgdep debian-6 = wget,patch,dpkg-dev,make,debian-builder,dh-make,fakeroot,ntpdate,libfile-mimeinfo-perl,libmodule-build-perl,libdate-manip-perl,libmail-sendmail-perl,diff

devel/pb/bin/pb

@@ -3050 +3050 @@
     pb_log(2,"DEBUG: pb_launchv returns ($vexist,$vpid)\n");
 
-    # After the VM is launched, then setup the SSH access
-    pb_ssh_setup($vtype,$nport);
+    # After the VM is launched, then setup the SSH access if not in creation phase
+    if ($pbstep != 0) {
+        pb_ssh_setup($vtype,$nport);
+    }
     
     # Skip that VM if something went wrong
@@ -4542 +4544 @@
 my $ddir=shift;
 my $mandatory=shift || "spec";
-my @files;
 
 my $flag = "mayfail" if (($mandatory eq "patch") || ($mandatory eq "src"));
@@ -4556 +4557 @@
 # If not mandatory return now
 return() if (($res != 0) and (($mandatory eq "patch") || ($mandatory eq "src")));
-opendir(DIR,"$dir") || die "Unable to open directory $dir: $!";
+return(pb_move_extracted_files($dir,$ddir));
+}
+
+sub pb_move_extracted_files {
+
+my $dir = shift;
+my $ddir = shift;
+my @files;
+
+opendir(DIR,"$dir") || confess "Unable to open directory $dir: $!";
 foreach my $f (readdir(DIR)) {
     next if ($f =~ /^\./);
@@ -4565 +4575 @@
     # Skip potential backup files
     next if ($f =~ /~$/);
-    move("$dir/$f","$ddir") || die "Unable to move $dir/$f to $ddir";
-    pb_log(2,"mv $dir/$f $ddir\n");
-    push @files,"$ddir/$f";
+    if ((-d "$dir/$f") && (! -l "$dir/$f")) {
+        # Case of the bug debian subdir
+        pb_mkdir_p("$ddir/$f");
+        push @files,pb_move_extracted_files("$dir/$f","$ddir/$f");
+    } else {
+        move("$dir/$f","$ddir") || die "Unable to move $dir/$f to $ddir";
+        pb_log(2,"mv $dir/$f $ddir\n");
+        push @files,"$ddir/$f";
+    }
 }
 closedir(DIR);