You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2011/07/27 00:51:41 UTC
svn commit: r1151284 - in /spamassassin/trunk: ./ lib/Mail/SpamAssassin/
lib/Mail/SpamAssassin/Bayes/ lib/Mail/SpamAssassin/Message/Metadata/
lib/Mail/SpamAssassin/Plugin/ spamd/ xt/
Author: mmartinec
Date: Tue Jul 26 22:51:38 2011
New Revision: 1151284
URL: http://svn.apache.org/viewvc?rev=1151284&view=rev
Log:
fix Test::Perl::Critic InputOutput::ProhibitTwoArgOpen warnings emitted by xt/60_perlcritic.t
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Bayes/CombineChi.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
spamassassin/trunk/lib/Mail/SpamAssassin/MailingList.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
spamassassin/trunk/sa-check_spamd.raw
spamassassin/trunk/sa-compile.raw
spamassassin/trunk/sa-update.raw
spamassassin/trunk/spamd/spamd.raw
spamassassin/trunk/xt/60_perlcritic.t
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Bayes/CombineChi.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Bayes/CombineChi.pm?rev=1151284&r1=1151283&r2=1151284&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Bayes/CombineChi.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Bayes/CombineChi.pm Tue Jul 26 22:51:38 2011
@@ -17,6 +17,8 @@
# limitations under the License.
# </...@LICENSE>
+use strict; # make Test::Perl::Critic happy
+
# this package is a no-op; the real impl code is in another pkg.
package Mail::SpamAssassin::Bayes::CombineChi; 1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm?rev=1151284&r1=1151283&r2=1151284&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm Tue Jul 26 22:51:38 2011
@@ -17,6 +17,8 @@
# limitations under the License.
# </...@LICENSE>
+use strict; # make Test::Perl::Critic happy
+
# this package is a no-op; the real impl code is in another pkg.
package Mail::SpamAssassin::Bayes::CombineNaiveBayes; 1;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm?rev=1151284&r1=1151283&r2=1151284&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm Tue Jul 26 22:51:38 2011
@@ -15,8 +15,8 @@
# limitations under the License.
# </...@LICENSE>
-package Mail::SpamAssassin::Dns;
-1;
+use strict; # make Test::Perl::Critic happy
+package Mail::SpamAssassin::Dns; 1;
package Mail::SpamAssassin::PerMsgStatus;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/MailingList.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/MailingList.pm?rev=1151284&r1=1151283&r2=1151284&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/MailingList.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/MailingList.pm Tue Jul 26 22:51:38 2011
@@ -17,8 +17,8 @@
# Eval Tests to detect genuine mailing lists.
-package Mail::SpamAssassin::MailingList;
-1;
+use strict; # make Test::Perl::Critic happy
+package Mail::SpamAssassin::MailingList; 1;
package Mail::SpamAssassin::PerMsgStatus;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?rev=1151284&r1=1151283&r2=1151284&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Tue Jul 26 22:51:38 2011
@@ -37,8 +37,8 @@
# ---------------------------------------------------------------------------
-package Mail::SpamAssassin::Message::Metadata::Received;
-1;
+use strict; # make Test::Perl::Critic happy
+package Mail::SpamAssassin::Message::Metadata::Received; 1;
package Mail::SpamAssassin::Message::Metadata;
use strict;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm?rev=1151284&r1=1151283&r2=1151284&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm Tue Jul 26 22:51:38 2011
@@ -1,4 +1,5 @@
package Mail::SpamAssassin::Plugin::FreeMail;
+use strict;
my $VERSION = 2.001;
### About:
@@ -108,7 +109,6 @@ my $VERSION = 2.001;
use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::PerMsgStatus;
use Mail::SpamAssassin::Util::RegistrarBoundaries;
-use strict;
use vars qw(@ISA);
@ISA = qw(Mail::SpamAssassin::Plugin);
Modified: spamassassin/trunk/sa-check_spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-check_spamd.raw?rev=1151284&r1=1151283&r2=1151284&view=diff
==============================================================================
--- spamassassin/trunk/sa-check_spamd.raw (original)
+++ spamassassin/trunk/sa-check_spamd.raw Tue Jul 26 22:51:38 2011
@@ -24,16 +24,16 @@
# Written by Daryl C. W. O'Shea, DOS Technologies <sp...@dostech.ca>
# See perldoc sa-check_spamd for program info.
+use strict;
+use warnings;
+use re 'taint';
+
my $PREFIX = '@@PREFIX@@'; # substituted at 'make' time
my $DEF_RULES_DIR = '@@DEF_RULES_DIR@@'; # substituted at 'make' time
my $LOCAL_RULES_DIR = '@@LOCAL_RULES_DIR@@'; # substituted at 'make' time
my $LOCAL_STATE_DIR = '@@LOCAL_STATE_DIR@@'; # substituted at 'make' time
use lib '@@INSTALLSITELIB@@'; # substituted at 'make' time
-use strict;
-use warnings;
-use re 'taint';
-
use Errno qw(EBADF);
use File::Spec;
use Config;
Modified: spamassassin/trunk/sa-compile.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-compile.raw?rev=1151284&r1=1151283&r2=1151284&view=diff
==============================================================================
--- spamassassin/trunk/sa-compile.raw (original)
+++ spamassassin/trunk/sa-compile.raw Tue Jul 26 22:51:38 2011
@@ -17,16 +17,16 @@
# limitations under the License.
# </...@LICENSE>
+use strict;
+use warnings;
+use re 'taint';
+
my $PREFIX = '@@PREFIX@@'; # substituted at 'make' time
my $DEF_RULES_DIR = '@@DEF_RULES_DIR@@'; # substituted at 'make' time
my $LOCAL_RULES_DIR = '@@LOCAL_RULES_DIR@@'; # substituted at 'make' time
my $LOCAL_STATE_DIR = '@@LOCAL_STATE_DIR@@'; # substituted at 'make' time
use lib '@@INSTALLSITELIB@@'; # substituted at 'make' time
-use strict;
-use warnings;
-use re 'taint';
-
use Errno qw(EBADF);
use File::Spec;
use Config;
Modified: spamassassin/trunk/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-update.raw?rev=1151284&r1=1151283&r2=1151284&view=diff
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Tue Jul 26 22:51:38 2011
@@ -17,6 +17,10 @@
# limitations under the License.
# </...@LICENSE>
+use strict;
+use warnings;
+use re 'taint';
+
my $VERSION = 'svnunknown';
if ('$Id$' =~ ':') {
# Subversion keyword "$Id$" has been successfully expanded.
@@ -25,7 +29,6 @@ if ('$Id$' =~ ':') {
$VERSION = 'svn' . (split(/\s+/, '$Id$'))[2];
}
-
my $PREFIX = '@@PREFIX@@'; # substituted at 'make' time
my $DEF_RULES_DIR = '@@DEF_RULES_DIR@@'; # substituted at 'make' time
my $LOCAL_RULES_DIR = '@@LOCAL_RULES_DIR@@'; # substituted at 'make' time
@@ -51,9 +54,6 @@ use File::Path;
use Getopt::Long;
use Pod::Usage;
use Config;
-use strict;
-use warnings;
-use re 'taint';
BEGIN { # see comments in "spamassassin.raw" for doco
my @bin = File::Spec->splitpath($0);
Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?rev=1151284&r1=1151283&r2=1151284&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Tue Jul 26 22:51:38 2011
@@ -16,6 +16,10 @@
# limitations under the License.
# </...@LICENSE>
+use strict;
+use warnings;
+use re 'taint';
+
my $PREFIX = '@@PREFIX@@'; # substituted at 'make' time
my $DEF_RULES_DIR = '@@DEF_RULES_DIR@@'; # substituted at 'make' time
my $LOCAL_RULES_DIR = '@@LOCAL_RULES_DIR@@'; # substituted at 'make' time
@@ -32,10 +36,6 @@ BEGIN {
} # REMOVEFORINST
}
-use strict;
-use warnings;
-use re 'taint';
-
# Big Ugly Hack; purpose: don't force requirement on IO::Socket::INET6
BEGIN {
use Socket;
Modified: spamassassin/trunk/xt/60_perlcritic.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/xt/60_perlcritic.t?rev=1151284&r1=1151283&r2=1151284&view=diff
==============================================================================
--- spamassassin/trunk/xt/60_perlcritic.t (original)
+++ spamassassin/trunk/xt/60_perlcritic.t Tue Jul 26 22:51:38 2011
@@ -29,7 +29,7 @@ print RC q{
severity = 5
verbose = 10
- exclude = ValuesAndExpressions::ProhibitLeadingZeros InputOutput::ProhibitBarewordFileHandles InputOutput::ProhibitTwoArgOpen TestingAndDebugging::RequireUseStrict Subroutines::ProhibitExplicitReturnUndef Variables::RequireLexicalLoopIterators Subroutines::ProhibitSubroutinePrototypes BuiltinFunctions::ProhibitStringyEval InputOutput::ProhibitInteractiveTest
+ exclude = ValuesAndExpressions::ProhibitLeadingZeros InputOutput::ProhibitBarewordFileHandles InputOutput::ProhibitTwoArgOpen Subroutines::ProhibitExplicitReturnUndef Variables::RequireLexicalLoopIterators Subroutines::ProhibitSubroutinePrototypes BuiltinFunctions::ProhibitStringyEval InputOutput::ProhibitInteractiveTest
[TestingAndDebugging::ProhibitNoStrict]
allow = refs