Changeset 1518


Ignore:
Timestamp:
May 12, 2012, 12:47:48 AM (7 years ago)
Author:
bruno
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:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Base.pm

    r1515 r1518  
    176176
    177177if (defined $error) {
    178     pb_log(0, $error) if ((! defined $verbose) || ($verbose ne "quiet")) || $Global::pb_stop_on_error;
     178    pb_log(0, $error) if (((! defined $verbose) || ($verbose ne "quiet")) || ($Global::pb_stop_on_error && ! $failure_ok));
    179179    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet") || $Global::pb_stop_on_error));
    180180    if (($Global::pb_stop_on_error) && (! $failure_ok)) {
    181         cluck "error running command ($cmd) with cwd=$cwd, pid=$$";
    182         exit(1);
     181        confess "error running command ($cmd) with cwd=$cwd, pid=$$";
    183182    }
    184183} else {
  • devel/pb-modules/lib/ProjectBuilder/Env.pm

    r1517 r1518  
    657657# after the input key name.  Useful for taking multi-line documentation and removing trailing spaces
    658658# or leading spaces.
    659 #transform PBDESC = PBDESC_raw s/\s+\n/\n/go;
     659#transform PBDESC = PBDESC_raw s/\\s+\\n/\\n/go;
    660660
    661661EOF
Note: See TracChangeset for help on using the changeset viewer.