svn commit: r491999 - in /spamassassin/trunk: build/mkupdates/run_part2 sa-update.raw

[fe...@apache.org]

Author: felicity
Date: Tue Jan  2 17:08:05 2007
New Revision: 491999

URL: http://svn.apache.org/viewvc?view=rev&rev=491999
Log:
bug 5269: previous change broke sa-update, so reverting out

Modified:
    spamassassin/trunk/build/mkupdates/run_part2
    spamassassin/trunk/sa-update.raw

Modified: spamassassin/trunk/build/mkupdates/run_part2
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/run_part2?view=diff&rev=491999&r1=491998&r2=491999
==============================================================================
--- spamassassin/trunk/build/mkupdates/run_part2 (original)
+++ spamassassin/trunk/build/mkupdates/run_part2 Tue Jan  2 17:08:05 2007
@@ -136,10 +136,6 @@
   exit 5
 fi
 
-# scope for this version line: 491592 => 491592_v32x to avoid collisions
-# with other versions' update-building scripts
-svnrev="${svnrev}_v32x"
-
 # TODO: if we were maintaining multiple versions, these would be
 # copied into a path specific to the version
 

Modified: spamassassin/trunk/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-update.raw?view=diff&rev=491999&r1=491998&r2=491999
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Tue Jan  2 17:08:05 2007
@@ -416,9 +416,7 @@
 
   my $newV;
   my $dnsV = do_txt_query($DNSQ);
-  # allow any 0-9 A-Z a-z - _ set, as long as it starts with a number.
-  # the idea is to allow "491592_v32x", for example
-  if (defined $dnsV && $dnsV =~ /^(\d[-_\dA-Za-z]+)/) {
+  if (defined $dnsV && $dnsV =~ /^(\d+)/) {
     $newV = $1 if (!defined $newV || $1 > $newV);
     dbg("dns: $DNSQ => $dnsV, parsed as $1");
   }