From 89df9a54fe4debf2c36958443361845b454e202f Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Mon, 13 Aug 2007 17:35:51 +0000
Subject: 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

---
 email_in.pl | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'email_in.pl')

diff --git a/email_in.pl b/email_in.pl
index 40474afaf..4bcf4438e 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) {
-- 
cgit v1.2.3-24-g4f1b