aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2013-01-06 00:27:35 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2013-01-06 00:27:35 +0100
commitb1305cb2fd23923d015e40da84463ddd34dd28d1 (patch)
treece633767e02f85aeeaa4b72112f0fde8d20d8814
parentBug 824616: The urlbase field in global/header.html.tmpl must be filtered (diff)
downloadbugzilla-b1305cb2fd23923d015e40da84463ddd34dd28d1.tar.gz
bugzilla-b1305cb2fd23923d015e40da84463ddd34dd28d1.tar.bz2
bugzilla-b1305cb2fd23923d015e40da84463ddd34dd28d1.zip
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 c90e5dc76..aeded375f 100644
--- a/Bugzilla/Config/MTA.pm
+++ b/Bugzilla/Config/MTA.pm
@@ -34,6 +34,12 @@ package Bugzilla::Config::MTA;
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 46790dd8f..4daaa5256 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -32,6 +32,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 base qw(Exporter);
our @EXPORT = qw(
REQUIRED_MODULES
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index 5ee6fd2eb..b79d95287 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -48,6 +48,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 {