Ignore:
Timestamp:
May 24, 2012, 10:54:48 AM (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r1553 r1595  
    336336# This may not be // proof. We should test for availability of repo and sleep if not
    337337my $cmd = "$pbos->{'install'} $deps";
    338 my $ret = pb_system($cmd, "Installing dependencies ($cmd)",undef,1);
     338my $ret = pb_system($cmd, "Installing dependencies ($cmd)","mayfail");
    339339# Try to accomodate deficient proxies
    340340if ($ret != 0) {
     
    446446    next if $p =~ /^\s*$/o;
    447447    if ($pbos->{'type'} eq  "rpm") {
    448         my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet",1);
     448        my $res = pb_system("rpm -q --whatprovides --quiet $p","","mayfail");
    449449        next if ($res eq 0);
    450450        pb_log(1, "INFO: missing dependency $p\n");
    451451    } elsif ($pbos->{'type'} eq "deb") {
    452         my $res = pb_system("dpkg -L $p","","quiet",1);
     452        my $res = pb_system("dpkg -L $p","","mayfail");
    453453        next if ($res eq 0);
    454454        open(CMD,"dpkg -l $p |") or die "Unable to run dpkg -l $p: $!";
     
    562562            my $pn = $bn;
    563563            $pn =~ s/\.rpm//;
    564             if (pb_system("rpm -q --quiet $pn","","quiet",1) != 0) {
     564            if (pb_system("rpm -q --quiet $pn","","mayfail") != 0) {
    565565                pb_system("sudo rpm -Uvh $ENV{'PBTMP'}/$bn","Adding package to setup repository");
    566566            }
Note: See TracChangeset for help on using the changeset viewer.