Changeset 1602 in ProjectBuilder

Timestamp:

May 26, 2012, 5:05:42 PM (12 years ago)

Author:

Bruno Cornec

Message:

• pb_system will echo systematically the word ERROR when one occurs, even if non blocking to ease search in logs.

File:

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

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

@@ -163 +163 @@
 # Exit now if the command may fail
 if ((defined $verbose) and ($verbose eq "mayfail")) {
-    pb_log(0,"N/A\n") if ($res != 0);
+    pb_log(0,"non blocking ERROR $res ($!)\n") if ($res != 0);
     pb_log(0,"OK\n") if ($res == 0);
     return($res) 
@@ -170 +170 @@
 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);
+$error = "ERROR: failed to execute ($cmd) in $cwd: $!\n" if ($res == -1);
+$error = "ERROR: child ($cmd) died with signal ".($res & 127).", ".($res & 128) ? 'with' : 'without'." coredump\n" if ($res & 127);
+$error = "ERROR: child ($cmd) cwd=$cwd exited with value ".($res >> 8)."\n" if ($res != 0);
 
 if (defined $error) {
@@ -178 +178 @@
     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) {
-        confess "error running command ($cmd) with cwd=$cwd, pid=$$";
-    }
+        confess("ERROR running command ($cmd) with cwd=$cwd, pid=$$");
+    } else {
+        pb_log(0,"ERROR running command ($cmd) with cwd=$cwd, pid=$$");
 } else {
     pb_log(0,"OK\n") if ((! defined $verbose) || ($verbose ne "quiet"));