Changeset 1539


Ignore:
Timestamp:
May 13, 2012, 12:21:51 PM (7 years ago)
Author:
bruno
Message:
  • checking packages is allowed to fail
  • Fix syntax error introduced by a previous patch
  • When using git and pb_vcs_up, for git we need to loop on all the dirs passed (change of interface after Eric's patch)
Location:
devel
Files:
3 edited

Legend:

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

    r1530 r1539  
    335335# This may not be // proof. We should test for availability of repo and sleep if not
    336336my $cmd = "$pbos->{'install'} $deps";
    337 my $ret = pb_system($cmd, "Installing dependencies ($cmd)", undef, 1);
     337my $ret = pb_system($cmd, "Installing dependencies ($cmd)",undef,1);
    338338# Try to accomodate deficient proxies
    339339if ($ret != 0) {
     
    445445    next if $p =~ /^\s*$/o;
    446446    if ($pbos->{'type'} eq  "rpm") {
    447         my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet", 1);
     447        my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet",1);
    448448        next if ($res eq 0);
    449449        pb_log(1, "INFO: missing dependency $p\n");
    450450    } elsif ($pbos->{'type'} eq "deb") {
    451         my $res = pb_system("dpkg -L $p","","quiet", 1);
     451        my $res = pb_system("dpkg -L $p","","quiet",1);
    452452        next if ($res eq 0);
    453453        open(CMD,"dpkg -l $p |") or die "Unable to run dpkg -l $p: $!";
  • devel/pb-modules/lib/ProjectBuilder/VCS.pm

    r1536 r1539  
    400400my $vcscmd = pb_vcs_cmd($scheme);
    401401
    402 if (($scheme =~ /^((svn)|(cvs)|(svk))/o) {
     402if ($scheme =~ /^((svn)|(cvs)|(svk))/o) {
    403403    pb_system("$vcscmd up ".join(' ',@dir),"Updating ".join(' ',@dir));
    404404} elsif ($scheme =~ /^((hg)|(git))/o) {
    405     pb_system("(cd $dir && $vcscmd pull)", "Updating $dir ");
     405    foreach my $d (@dir) {
     406        pb_system("(cd $d && $vcscmd pull)", "Updating $d ");
     407    }
    406408} elsif (($scheme eq "flat") || ($scheme eq "ftp") || ($scheme eq "http"))   {
    407409} else {
     
    425427my $vcscmd = pb_vcs_cmd($scheme);
    426428
    427 if (($scheme =~ /^((svn)|(cvs)|(svk))/o) {
     429if ($scheme =~ /^((svn)|(cvs)|(svk))/o) {
    428430    pb_system("cd $dir && $vcscmd ci -m \"$msg\" .","Checking in $dir ");
    429431} elsif ($scheme =~ /^git/) {
     
    472474my $l = undef;
    473475
    474 if (($scheme =~ /^((svn)|(cvs)|(svk))/o) {
     476if ($scheme =~ /^((svn)|(cvs)|(svk))/o) {
    475477    open(PIPE,"$vcscmd diff $dir |") || die "Unable to get $vcscmd diff from $dir";
    476478    $l = 0;
  • devel/pb/bin/pb

    r1537 r1539  
    15901590            $cmd .= " $chkopt" if (defined $chkopt);
    15911591            $cmd .= " $made";
    1592             pb_system("$cmd","Checking validity of rpms with $chkcmd","verbose");
     1592            my $ret = pb_system("$cmd","Checking validity of rpms with $chkcmd","verbose",1);
     1593            pb_log(0,"ERROR: when checking packages validity\n") if ($ret ne 0);
    15931594        }
    15941595        my $rpms ="";
     
    16061607        }
    16071608        if (-x $chkcmd) {
    1608             pb_system("$chkcmd $chkopt $made2","Checking validity of debs with $chkcmd","verbose");
     1609            my $ret = pb_system("$chkcmd $chkopt $made2","Checking validity of debs with $chkcmd","verbose",1);
     1610            pb_log(0,"ERROR: when checking packages validity\n") if ($ret ne 0);
    16091611        }
    16101612        pb_log(0,"deb packages generated: $made2\n");
Note: See TracChangeset for help on using the changeset viewer.