You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/10/05 14:55:48 UTC
svn commit: r582236 - in /spamassassin/trunk/build/automc: buildbot_ready
mail_freqs_for_changed_rules
Author: jm
Date: Fri Oct 5 05:55:47 2007
New Revision: 582236
URL: http://svn.apache.org/viewvc?rev=582236&view=rev
Log:
tidy up formatting; include the freqs file header; include mass-check name; don't include __SUBRULES
Modified:
spamassassin/trunk/build/automc/buildbot_ready
spamassassin/trunk/build/automc/mail_freqs_for_changed_rules
Modified: spamassassin/trunk/build/automc/buildbot_ready
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/buildbot_ready?rev=582236&r1=582235&r2=582236&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/buildbot_ready (original)
+++ spamassassin/trunk/build/automc/buildbot_ready Fri Oct 5 05:55:47 2007
@@ -125,7 +125,7 @@
print " $rurl\n\n";
print "QUICK FREQS REPORT (this mass-check only):\n\n";
- system ("$perl hit-frequencies -c tstrules -a -x -p -T -s 0 > ../freqs");
+ system ("$perl hit-frequencies -c tstrules -x -p -T -s 0 > ../freqs");
system ("cat ../freqs");
system ("( cd .. ; ".
"$perl ./build/automc/mail_freqs_for_changed_rules '$rurl' freqs )");
Modified: spamassassin/trunk/build/automc/mail_freqs_for_changed_rules
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/mail_freqs_for_changed_rules?rev=582236&r1=582235&r2=582236&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/mail_freqs_for_changed_rules (original)
+++ spamassassin/trunk/build/automc/mail_freqs_for_changed_rules Fri Oct 5 05:55:47 2007
@@ -64,7 +64,7 @@
last unless $file; # EOF
if ($file !~ /\.cf$/i) {
- print "ignored file $file\n";
+ print "no rules in non-rule file $file\n";
next;
}
@@ -87,11 +87,11 @@
my @rules = sort keys %poss_rules;
if (@rules <= 0) {
- print "no rules found, ignoring.\n";
+ print "no rules found in checkin, ignoring.\n";
exit 0;
}
-print "possible rules: ".join(' ', @rules)."\n";
+# print "mailing about changed/new rules: ".join(' ', @rules)."\n";
my $files = join (' ', @files);
# ---------------------------------------------------------------------------
@@ -107,14 +107,19 @@
# ---------------------------------------------------------------------------
# and the freqs we just built
my %freqs = ();
+my $freqs_hdr = '';
open (FREQS, "<$freqsfile")
or warn "cannot open '$freqsfile'";
while (<FREQS>) {
+ / (?:\(all messages|SPAM\%)/ and $freqs_hdr .= $_;
/(.* )(\S+)\s*$/ or next;
$freqs{$2} = $1.$2;
}
close FREQS;
+$mcname = `pwd`;
+$mcname =~ /\/(mc-[^\/]*)\/ and $mcname = $1;
+
# ---------------------------------------------------------------------------
# output each of the found rules' freqs
my $tomail =
@@ -127,7 +132,8 @@
Log:
$svn_msg
-";
+Freqs for those rules in '$mcname' mass-check:
+$freqs_hdr";
foreach my $r (@rules) {
next unless ($freqs{$r});
@@ -135,7 +141,6 @@
}
$tomail .= "
-
More: $rurl
";