summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2013-01-06 00:24:23 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2013-01-06 00:24:23 +0100
commit9ee81348aaa57b34f0c4f0b75bc387f24beb451e (patch)
treeb9c93ee730b3135299ee3f80c7ed43598c5ca1ca
parent48e96823d3ebc484589222e3c5a83fea90997856 (diff)
downloadbugzilla-9ee81348aaa57b34f0c4f0b75bc387f24beb451e.tar.gz
bugzilla-9ee81348aaa57b34f0c4f0b75bc387f24beb451e.tar.xz
Bug 826678: Disable warnings about the deprecated Return::Value module when loading Email::Send
r=wicked a=LpSolit
-rw-r--r--Bugzilla/Config/MTA.pm6
-rw-r--r--Bugzilla/Install/Requirements.pm7
-rw-r--r--Bugzilla/Mailer.pm6
3 files changed, 19 insertions, 0 deletions
diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm
index a6ca36613..2f4af72f4 100644
--- a/Bugzilla/Config/MTA.pm
+++ b/Bugzilla/Config/MTA.pm
@@ -11,6 +11,12 @@ use 5.10.1;
use strict;
use Bugzilla::Config::Common;
+# Return::Value 1.666002 pollutes the error log with warnings about this
+# deprecated module. We have to set NO_CLUCK = 1 before loading Email::Send
+# to disable these warnings.
+BEGIN {
+ $Return::Value::NO_CLUCK = 1;
+}
use Email::Send;
our $sortkey = 1200;
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 9bc5be14a..eb36d15a6 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -23,6 +23,13 @@ use List::Util qw(max);
use Safe;
use Term::ANSIColor;
+# Return::Value 1.666002 pollutes the error log with warnings about this
+# deprecated module. We have to set NO_CLUCK = 1 before loading Email::Send
+# in have_vers() to disable these warnings.
+BEGIN {
+ $Return::Value::NO_CLUCK = 1;
+}
+
use parent qw(Exporter);
our @EXPORT = qw(
REQUIRED_MODULES
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index d9aa9edc9..6602c6cef 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -24,6 +24,12 @@ use Encode qw(encode);
use Encode::MIME::Header;
use Email::Address;
use Email::MIME;
+# Return::Value 1.666002 pollutes the error log with warnings about this
+# deprecated module. We have to set NO_CLUCK = 1 before loading Email::Send
+# to disable these warnings.
+BEGIN {
+ $Return::Value::NO_CLUCK = 1;
+}
use Email::Send;
sub MessageToMTA {