Changeset 1539 in ProjectBuilder

Timestamp:

May 13, 2012, 12:21:51 PM (12 years ago)

Author:

Bruno Cornec

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:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/VCS.pm (modified) (3 diffs)
• pb/bin/pb (modified) (2 diffs)

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

@@ -335 +335 @@
 # 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)",undef,1);
 # Try to accomodate deficient proxies
 if ($ret != 0) {
@@ -445 +445 @@
     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","","quiet",1);
         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","","quiet",1);
         next if ($res eq 0);
         open(CMD,"dpkg -l $p |") or die "Unable to run dpkg -l $p: $!";

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

@@ -400 +400 @@
 my $vcscmd = pb_vcs_cmd($scheme);
 
-if (($scheme =~ /^((svn)|(cvs)|(svk))/o) {
+if ($scheme =~ /^((svn)|(cvs)|(svk))/o) {
     pb_system("$vcscmd up ".join(' ',@dir),"Updating ".join(' ',@dir));
 } elsif ($scheme =~ /^((hg)|(git))/o) {
-    pb_system("(cd $dir && $vcscmd pull)", "Updating $dir ");
+    foreach my $d (@dir) {
+        pb_system("(cd $d && $vcscmd pull)", "Updating $d ");
+    }
 } elsif (($scheme eq "flat") || ($scheme eq "ftp") || ($scheme eq "http"))   {
 } else {
@@ -425 +427 @@
 my $vcscmd = pb_vcs_cmd($scheme);
 
-if (($scheme =~ /^((svn)|(cvs)|(svk))/o) {
+if ($scheme =~ /^((svn)|(cvs)|(svk))/o) {
     pb_system("cd $dir && $vcscmd ci -m \"$msg\" .","Checking in $dir ");
 } elsif ($scheme =~ /^git/) {
@@ -472 +474 @@
 my $l = undef;
 
-if (($scheme =~ /^((svn)|(cvs)|(svk))/o) {
+if ($scheme =~ /^((svn)|(cvs)|(svk))/o) {
     open(PIPE,"$vcscmd diff $dir |") || die "Unable to get $vcscmd diff from $dir";
     $l = 0;

devel/pb/bin/pb

@@ -1590 +1590 @@
             $cmd .= " $chkopt" if (defined $chkopt);
             $cmd .= " $made";
-            pb_system("$cmd","Checking validity of rpms with $chkcmd","verbose");
+            my $ret = pb_system("$cmd","Checking validity of rpms with $chkcmd","verbose",1);
+            pb_log(0,"ERROR: when checking packages validity\n") if ($ret ne 0);
         }
         my $rpms ="";
@@ -1606 +1607 @@
         }
         if (-x $chkcmd) {
-            pb_system("$chkcmd $chkopt $made2","Checking validity of debs with $chkcmd","verbose");
+            my $ret = pb_system("$chkcmd $chkopt $made2","Checking validity of debs with $chkcmd","verbose",1);
+            pb_log(0,"ERROR: when checking packages validity\n") if ($ret ne 0);
         }
         pb_log(0,"deb packages generated: $made2\n");