Changeset 1595 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

May 24, 2012, 10:54:48 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb_system is back to 3 params, as the previously undocumented "mayfail" 3rd parameter povides what the 4th was dded for. callers adapted in relationship

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)

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

@@ -336 +336 @@
 # This may not be // proof. We should test for availability of repo and sleep if not
 my $cmd = "$pbos->{'install'} $deps";
-my $ret = pb_system($cmd, "Installing dependencies ($cmd)",undef,1);
+my $ret = pb_system($cmd, "Installing dependencies ($cmd)","mayfail");
 # Try to accomodate deficient proxies
 if ($ret != 0) {
@@ -446 +446 @@
     next if $p =~ /^\s*$/o;
     if ($pbos->{'type'} eq  "rpm") {
-        my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet",1);
+        my $res = pb_system("rpm -q --whatprovides --quiet $p","","mayfail");
         next if ($res eq 0);
         pb_log(1, "INFO: missing dependency $p\n");
     } elsif ($pbos->{'type'} eq "deb") {
-        my $res = pb_system("dpkg -L $p","","quiet",1);
+        my $res = pb_system("dpkg -L $p","","mayfail");
         next if ($res eq 0);
         open(CMD,"dpkg -l $p |") or die "Unable to run dpkg -l $p: $!";
@@ -562 +562 @@
             my $pn = $bn;
             $pn =~ s/\.rpm//;
-            if (pb_system("rpm -q --quiet $pn","","quiet",1) != 0) {
+            if (pb_system("rpm -q --quiet $pn","","mayfail") != 0) {
                 pb_system("sudo rpm -Uvh $ENV{'PBTMP'}/$bn","Adding package to setup repository");
             }