Bug 826678: Disable warnings about the deprecated Return::Value module when loading...

r=wicked a=LpSolit

diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm
index a6ca3661322fb5c497ba2d9e59f3e38254ebc937..2f4af72f4e697eb9bce73bb67dad94120dc991e5 100644 (file)
--- 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 9bc5be14a77a33bbf2a2fe00954fedbf93dacd4d..eb36d15a6f65f73632adde173691e0b60aed075e 100644 (file)
--- 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 d9aa9edc9270c8f2774ea939171a52ee9ece1c98..6602c6cef087d5d195442a0db429cb73cec78251 100644 (file)
--- 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 {