Bug 1155009: Cache::Memcached causes email_in.pl to stop working

r/a=glob

diff --git a/email_in.pl b/email_in.pl
index ae4c42bde5f670d51022177baed4cff30caf88d5..a936791b75ec7d527ac52b2e7073bfa309b55eb5 100755 (executable)
--- a/email_in.pl
+++ b/email_in.pl
@@ -469,7 +469,7 @@ sub die_handler {
 
     # 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;
+    die @_ if ($^S // Bugzilla::Error::_in_eval());
 
     # We can't depend on the MTA to send an error message, so we have
     # to generate one properly.