Changeset 1518 in ProjectBuilder for devel

Timestamp:

May 12, 2012, 12:47:48 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Base.pm: Don't display the error message if failure is ok. Simplify cluck + exit to confess. (Eric Anderson)
• Env.pm: We are in a "", so escape the \'s. (Eric Anderson)

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Base.pm (modified) (1 diff)
• Env.pm (modified) (1 diff)

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

@@ -176 +176 @@
 
 if (defined $error) {
-    pb_log(0, $error) if ((! defined $verbose) || ($verbose ne "quiet")) || $Global::pb_stop_on_error;
+    pb_log(0, $error) if (((! defined $verbose) || ($verbose ne "quiet")) || ($Global::pb_stop_on_error && ! $failure_ok));
     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) && (! $failure_ok)) {
-        cluck "error running command ($cmd) with cwd=$cwd, pid=$$";
-        exit(1);
+        confess "error running command ($cmd) with cwd=$cwd, pid=$$";
     }
 } else {

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

@@ -657 +657 @@
 # after the input key name.  Useful for taking multi-line documentation and removing trailing spaces
 # or leading spaces.
-#transform PBDESC = PBDESC_raw s/\s+\n/\n/go;
+#transform PBDESC = PBDESC_raw s/\\s+\\n/\\n/go;
 
 EOF