svn commit: r1151279 - in /spamassassin/trunk: lib/Mail/SpamAssassin.pm xt/60_perlcritic.t

[mm...@apache.org]

Author: mmartinec
Date: Tue Jul 26 22:24:21 2011
New Revision: 1151279

URL: http://svn.apache.org/viewvc?rev=1151279&view=rev
Log:
SpamAssassin.pm: fix a Subroutines::ProhibitReturnSort warning emitted by xt/60_perlcritic.t about a "return" followed by a "sort"; test I/O status in 60_perlcritic.t

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin.pm
    spamassassin/trunk/xt/60_perlcritic.t

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=1151279&r1=1151278&r2=1151279&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Tue Jul 26 22:24:21 2011
@@ -2063,9 +2063,8 @@ sub _get_cf_pre_files_in_dir {
       my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
       die "_get_cf_pre_files_in_dir error: $eval_stat";
     };
-    return sort { $a cmp $b } @cfs;
-
-    die "oops! $@";     # should never get here
+    @cfs = sort { $a cmp $b } @cfs;
+    return @cfs;
   }
   else {
     opendir(SA_CF_DIR, $dir) or warn "config: cannot opendir $dir: $!\n";

Modified: spamassassin/trunk/xt/60_perlcritic.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/xt/60_perlcritic.t?rev=1151279&r1=1151278&r2=1151279&view=diff
==============================================================================
--- spamassassin/trunk/xt/60_perlcritic.t (original)
+++ spamassassin/trunk/xt/60_perlcritic.t Tue Jul 26 22:24:21 2011
@@ -22,7 +22,7 @@ if ( $EVAL_ERROR ) {
     plan( skip_all => $msg );
 }
 
-open RC, ">../t/log/perlcritic.rc" or die "cannot write t/log/perlcritic.rc";
+open RC, ">../t/log/perlcritic.rc" or die "cannot create t/log/perlcritic.rc";
 
 # we should remove some of these excludes if/when we feel like fixing 'em!
 print RC q{
@@ -34,8 +34,8 @@ print RC q{
   [TestingAndDebugging::ProhibitNoStrict]
   allow = refs
 
-};
-close RC;
+}  or die "cannot write t/log/perlcritic.rc";
+close RC  or die "cannot close t/log/perlcritic.rc";
 
 Test::Perl::Critic->import( -profile => "../t/log/perlcritic.rc" );
 all_critic_ok("../blib");