Mailing List Archive

Author: jm
Date: Tue Jan 2 09:26:34 2007
New Revision: 491858

URL: http://svn.apache.org/viewvc?view=rev&rev=491858
Log:
bug 5629: scope v3.2.0 updates with a 'magic' string so they won't collide with 3.1.x updates (or any future 3.3.x, 3.4.x, etc line)

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=491858&r1=491857&r2=491858
==============================================================================
--- spamassassin/trunk/build/mkupdates/run_part2 (original)
+++ spamassassin/trunk/build/mkupdates/run_part2 Tue Jan 2 09:26:34 2007
@@ -136,6 +136,10 @@
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=491858&r1=491857&r2=491858
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Tue Jan 2 09:26:34 2007
@@ -416,7 +416,9 @@

my $newV;
my $dnsV = do_txt_query($DNSQ);
- if (defined $dnsV && $dnsV =~ /^(\d+)/) {
+ # 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]+)/) {
$newV = $1 if (!defined $newV || $1 > $newV);
dbg("dns: $DNSQ => $dnsV, parsed as $1");
}