Skip to content

bugzilla
bugzilla
Commit 89df9a54 authored by mkanat%bugzilla.org's avatar mkanat%bugzilla.org
Browse files
Options

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
parent 4046936f
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
email_in.pl
View file @ 89df9a54
...@@ -340,6 +340,10 @@ sub die_handler { ...@@ -340,6 +340,10 @@ sub die_handler {
# the user-error or code-error template ended. So we don't really die. # the user-error or code-error template ended. So we don't really die.
return if $msg->isa('Template::Exception') && $msg->type eq 'return'; 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 # We can't depend on the MTA to send an error message, so we have
# to generate one properly. # to generate one properly.
if ($input_email) { if ($input_email) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment