Changeset 1963 in ProjectBuilder
- Timestamp:
- May 12, 2015, 12:07:15 PM (9 years ago)
- Location:
- devel
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/etc/pb.conf
r1961 r1963 591 591 osperldep deb = 592 592 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 593 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 593 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 594 594 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 595 595 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
r1958 r1963 3050 3050 pb_log(2,"DEBUG: pb_launchv returns ($vexist,$vpid)\n"); 3051 3051 3052 # After the VM is launched, then setup the SSH access 3053 pb_ssh_setup($vtype,$nport); 3052 # After the VM is launched, then setup the SSH access if not in creation phase 3053 if ($pbstep != 0) { 3054 pb_ssh_setup($vtype,$nport); 3055 } 3054 3056 3055 3057 # Skip that VM if something went wrong … … 4542 4544 my $ddir=shift; 4543 4545 my $mandatory=shift || "spec"; 4544 my @files;4545 4546 4546 4547 my $flag = "mayfail" if (($mandatory eq "patch") || ($mandatory eq "src")); … … 4556 4557 # If not mandatory return now 4557 4558 return() if (($res != 0) and (($mandatory eq "patch") || ($mandatory eq "src"))); 4558 opendir(DIR,"$dir") || die "Unable to open directory $dir: $!"; 4559 return(pb_move_extracted_files($dir,$ddir)); 4560 } 4561 4562 sub pb_move_extracted_files { 4563 4564 my $dir = shift; 4565 my $ddir = shift; 4566 my @files; 4567 4568 opendir(DIR,"$dir") || confess "Unable to open directory $dir: $!"; 4559 4569 foreach my $f (readdir(DIR)) { 4560 4570 next if ($f =~ /^\./); … … 4565 4575 # Skip potential backup files 4566 4576 next if ($f =~ /~$/); 4567 move("$dir/$f","$ddir") || die "Unable to move $dir/$f to $ddir"; 4568 pb_log(2,"mv $dir/$f $ddir\n"); 4569 push @files,"$ddir/$f"; 4577 if ((-d "$dir/$f") && (! -l "$dir/$f")) { 4578 # Case of the bug debian subdir 4579 pb_mkdir_p("$ddir/$f"); 4580 push @files,pb_move_extracted_files("$dir/$f","$ddir/$f"); 4581 } else { 4582 move("$dir/$f","$ddir") || die "Unable to move $dir/$f to $ddir"; 4583 pb_log(2,"mv $dir/$f $ddir\n"); 4584 push @files,"$ddir/$f"; 4585 } 4570 4586 } 4571 4587 closedir(DIR);
Note:
See TracChangeset
for help on using the changeset viewer.