Changeset 1505

Timestamp:

05/09/12 02:20:04 (13 months ago)

Author:

bruno

Message:

• Base.pm: use Carp and Cwd so we can give better error messages. Use new Global::pb_stop_on_error variable to decide whether we should abort on an error. (Eric Anderson from 9c3c696597c49b385df409311b1385d7a394db5a)
• Distribution.pm: Remove useless redundant check of deps not maching whitespace, improve message since it is likely to call sudo. Skip dependencies that are all whitespace since that leads to errors when running dpkg -L <whitespace> (Eric Anderson from 9c3c696597c49b385df409311b1385d7a394db5a)

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Base.pm (modified) (2 diffs)
• Distribution.pm (modified) (2 diffs)

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

@@ -14 +14 @@
 use strict;
 use lib qw (lib);
+use Carp 'cluck';
+use Cwd;
 use File::Path;
 use File::Temp qw(tempdir);
@@ -159 +161 @@
     return($res) 
     }
-if ($res == -1) {
-    pb_log(0,"failed to execute ($cmd): $!\n") if ((! defined $verbose) || ($verbose ne "quiet"));
-    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet")));
-} elsif ($res & 127) {
-    pb_log(0, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n") if ((! defined $verbose) || ($verbose ne "quiet"));
-    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet")));
-} elsif ($res == 0) {
+
+my $cwd = getcwd;
+my $error = undef;
+$error = "failed to execute ($cmd) in $cwd: $!\n" if ($res == -1);
+$error = "child ($cmd) died with signal ".($res & 127).", ".($res & 128) ? 'with' : 'without'." coredump\n" if ($res & 127);
+$error = "child ($cmd) cwd=$cwd exited with value ".($res >> 8)."\n" if ($res != 0);
+
+if (defined $error) {
+    pb_log(0, $error) if ((! defined $verbose) || ($verbose ne "quiet")) || $Global::pb_stop_on_error;
+    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet") || $Global::pb_stop_on_error));
+    if ($Global::pb_stop_on_error) {
+        cluck "error running command ($cmd) with cwd=$cwd";
+        exit(1);
+    }
+} else {
     pb_log(0,"OK\n") if ((! defined $verbose) || ($verbose ne "quiet"));
-    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((defined $verbose) and (-f "$ENV{'PBTMP'}/system.$$.log") and ($verbose ne "quiet"));
-} else {
-    pb_log(0, "child ($cmd) exited with value ".($? >> 8)."\n") if ((! defined $verbose) || ($verbose ne "quiet"));
-    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet")));
-}
+    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and (defined $verbose) and ($verbose ne "quiet"));
+}
+
 return($res);
 }

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

@@ -305 +305 @@
 
 # Get dependencies in the build file if not forced
-$deps = pb_distro_getdeps($f, $pbos) if (not defined $deps);
+$deps = pb_distro_getdeps($f,$pbos) if (not defined $deps);
 pb_log(2,"deps: $deps\n");
 return if ((not defined $deps) || ($deps =~ /^\s*$/));
-if ($deps !~ /^[    ]*$/) {
-    # This may not be // proof. We should test for availability of repo and sleep if not
-    pb_system("$pbos->{'install'} $deps","Installing dependencies ($deps)");
-    }
+
+# This may not be // proof. We should test for availability of repo and sleep if not
+my $cmd = "$pbos->{'install'} $deps";
+pb_system($cmd,"Installing dependencies ($cmd)");
 }
 
@@ -394 +394 @@
 my $deps2 = "";
 # Avoid to install what is already there
-foreach my $p (split(/ /,$deps)) {
+foreach my $p (split(/\s+/,$deps)) {
+    next if $p =~ /^\s*$/o;
     if ($pbos->{'type'} eq  "rpm") {
         my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet");