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

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=vladd, a=LpSolit

diff --git a/email_in.pl b/email_in.pl
index 40474afaf6bff7327c1fe185e14646aa72a8506d..4bcf4438e256f82171dc9e2fdb8fb990f65532f1 100644 (file)
--- 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) {