Bug 380797: email_in.pl was dying with "Can't locate PatchReader.pm" when…

Bug 380797: email_in.pl was dying with "Can't locate PatchReader.pm" when PatchReader not installed because it was calling die_handler for eval {} blocks. Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=vladd, a=LpSolit

Bug 380797: email_in.pl was dying with "Can't locate PatchReader.pm" when…
89df9a54 · mkanat%bugzilla.org · 4046936f · 89df9a54
Commit 89df9a54 authored Aug 13, 2007 by mkanat%bugzilla.org
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

email_in.pl email_in.pl +4 -0

No files found.
--- a/email_in.pl
+++ b/email_in.pl
@@ -340,6 +340,10 @@ sub die_handler {
    # the user-error or code-error template ended. So we don't really die.
    return if $msg->isa('Template::Exception') && $msg->type eq 'return';

+    # If this is inside an eval, then we should just act like...we're
+    # in an eval (instead of printing the error and exiting).
+    die(@_) if $^S;
+
    # We can't depend on the MTA to send an error message, so we have
    # to generate one properly.
    if ($input_email) {