From: mkanat%bugzilla.org <>
Date: Mon, 13 Aug 2007 17:38:09 +0000 (+0000)
Subject: Bug 380797: email_in.pl was dying with "Can't locate PatchReader.pm" when PatchReader... 
X-Git-Tag: bugzilla-3.0.1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c52026dc96d47fd87d3be55d723e3884df0d19b;p=thirdparty%2Fbugzilla.git

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

diff --git a/email_in.pl b/email_in.pl
index 40474afaf6..4bcf4438e2 100644
--- 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) {