svn commit: r329703 - in /spamassassin/trunk: build/automc/run_preflight masses/corpora/mk-corpus-link-farm

[jm...@apache.org]

Author: jm
Date: Sun Oct 30 18:03:28 2005
New Revision: 329703

URL: http://svn.apache.org/viewcvs?rev=329703&view=rev
Log:
use new corpus-creation helper script

Modified:
    spamassassin/trunk/build/automc/run_preflight
    spamassassin/trunk/masses/corpora/mk-corpus-link-farm

Modified: spamassassin/trunk/build/automc/run_preflight
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/automc/run_preflight?rev=329703&r1=329702&r2=329703&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/run_preflight (original)
+++ spamassassin/trunk/build/automc/run_preflight Sun Oct 30 18:03:28 2005
@@ -8,6 +8,9 @@
   die "no perl path found in ARGV!";
 }
 
+# get the mass-check corpora ready
+run "/home/bbmass/populate_cor";
+
 chdir "masses" or die;
 
 my $slavename = "generic";

Modified: spamassassin/trunk/masses/corpora/mk-corpus-link-farm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/masses/corpora/mk-corpus-link-farm?rev=329703&r1=329702&r2=329703&view=diff
==============================================================================
--- spamassassin/trunk/masses/corpora/mk-corpus-link-farm (original)
+++ spamassassin/trunk/masses/corpora/mk-corpus-link-farm Sun Oct 30 18:03:28 2005
@@ -152,12 +152,13 @@
 sub dist_across_dests {
   foreach my $dest (@$dests) {
     my %want = ();
+my $wantnum = $dest->{num_msgs} || 99999999;
     foreach my $class (@classes) {
-      $want{$class} = $dest->{num_msgs} || 99999999;
+      $want{$class} = $wantnum;
     }
 
     $dest->{srcs} = [ ];
-    print "\n$dest->{dir}: want $dest->{num_msgs} messages\n";
+    print "\n$dest->{dir}: want $wantnum messages\n";
 
     foreach my $src (@$srcs) {
       foreach my $class (@classes) {
@@ -239,7 +240,7 @@
   undef %files;     # no longer need that
 
   # @files is now sorted with the "youngest" files first.  check:
-  if (-M $files[0] > -M $files[-1]) {
+  if (scalar @files && -M $files[0] > -M $files[-1]) {
     warn "oops! files out of order, should be youngest first: ".
                     join(' ',@files);
   }