Changeset 1513 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Base.pm

Timestamp:

May 10, 2012, 12:47:44 PM (12 years ago)

Author:

Bruno Cornec

Message:

r4758@localhost: bruno | 2012-05-10 10:49:36 +0200
Base.pm: Add a parameter to pb_system that allows commands to fail even if pb_stop_on_error is set. Some callers handle the error code. Add in pid to the error output from pb_system for help in tracking down which parent ran the command.

File:

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

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

@@ -136 +136 @@
 The second parameter is the message to print on screen. If none is given, then the command is printed.
 The third parameter print the result of the command after correct execution if value is verbose. If value is noredir, it avoids redirecting outputs (e.g. for vi). If value is quiet, doesn't print anything at all.
+The fourth parameter determines whether failure of the command is ok even if $Global::pb_stop_on_error is set, because the caller will be handling the error.
 This function returns as a result the return value of the system command.
 
@@ -147 +148 @@
 my $cmt=shift || $cmd;
 my $verbose=shift || undef;
+my $failure_ok = shift || 0;
 my $redir = "";
 
@@ -175 +177 @@
     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";
+    if (($Global::pb_stop_on_error) && (! $failure_ok)) {
+        cluck "error running command ($cmd) with cwd=$cwd, pid=$$";
         exit(1);
     }