Changeset 1596 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder

Timestamp:

May 25, 2012, 12:52:34 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Improve system cmd display in Distribution.pm for deps analysis
• umount /proc in the VE when using rpmbootstrap, if it wasn't unmounted due to error, to allow snapshots to work correctly
• pbtest should now be able to build afio in an rpm VE (The VE is setup correctly again, including fedora 16 having the requiretty constraint))

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Distribution.pm (modified) (1 diff)
• VE.pm (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -446 +446 @@
     next if $p =~ /^\s*$/o;
     if ($pbos->{'type'} eq  "rpm") {
-        my $res = pb_system("rpm -q --whatprovides --quiet $p","","mayfail");
+        my $res = pb_system("rpm -q --whatprovides --quiet $p","Looking for $p","mayfail");
         next if ($res eq 0);
         pb_log(1, "INFO: missing dependency $p\n");

devel/pb-modules/lib/ProjectBuilder/VE.pm

@@ -184 +184 @@
                 my $command = pb_check_req("rpmbootstrap",0);
                 pb_system("$sudocmd $command $rbsopt $postinstall $addpkgs $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} $rbsverb","Creating the rpmbootstrap VE for $pbos->{'name'}-$pbos->{'version'} ($pbos->{'arch'})", "verbose");
+                pb_system("$sudocmd /bin/umount $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/proc","Umounting stale /proc","mayfail") if (-f "$root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/proc/cpuinfo");
             } elsif ($verpmstyle eq "mock") {
                 my ($rbsconf) = pb_conf_get("rbsconf");