From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sat, 5 Jan 2013 23:25:35 +0000 (+0100)
Subject: Bug 826678: Disable warnings about the deprecated Return::Value module when loading... 
X-Git-Tag: bugzilla-4.4rc2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0bb8832ebf01682c5b39472aec6395d7fceada8;p=thirdparty%2Fbugzilla.git

Bug 826678: Disable warnings about the deprecated Return::Value module when loading Email::Send
r=wicked a=LpSolit
---

diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm
index bf038cf493..8184b9f5e7 100644
--- a/Bugzilla/Config/MTA.pm
+++ b/Bugzilla/Config/MTA.pm
@@ -10,6 +10,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 0cdc3b2919..493b78eddb 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -22,6 +22,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 5ef7310635..64640150ba 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -23,6 +23,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 {