svn commit: r783933 - /spamassassin/trunk/masses/rule-qa/reports-from-logs

[jm...@apache.org]

Author: jm
Date: Thu Jun 11 21:48:18 2009
New Revision: 783933

URL: http://svn.apache.org/viewvc?rev=783933&view=rev
Log:
attempt to permit the case where a user uploads no ham logs

Modified:
    spamassassin/trunk/masses/rule-qa/reports-from-logs

Modified: spamassassin/trunk/masses/rule-qa/reports-from-logs
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/reports-from-logs?rev=783933&r1=783932&r2=783933&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/reports-from-logs (original)
+++ spamassassin/trunk/masses/rule-qa/reports-from-logs Thu Jun 11 21:48:18 2009
@@ -357,16 +357,17 @@
         print "username in ham log: $u\n";
       }
 
-      if (scalar keys %spam <= 0 || scalar keys %ham <= 0) {
+      if (scalar keys %spam <= 0 && scalar keys %ham <= 0) {
         warn "no files found for $class.$rtype";
         return;
       }
 
       unlink "$cf{tmp}/ham.log.$$", "$cf{tmp}/spam.log.$$";
       for my $user (sort keys %spam) {
-        next unless $ham{$user};
+        my $hamfiles = [];
+        if ($ham{$user}) { $hamfiles = [ "$logsdir/$ham{$user}" ]; }
 
-        time_filter_fileset([ "$logsdir/$ham{$user}" ],
+        time_filter_fileset($hamfiles,
                 "$cf{tmp}/ham.log.$$", $OLDEST_HAM_WEEKS, undef);
         time_filter_fileset([ "$logsdir/$spam{$user}" ],
                 "$cf{tmp}/spam.log.$$", $OLDEST_SPAM_WEEKS, undef);