On Saturday 17 January 2004 23:30 CET [EMAIL PROTECTED] wrote:
> Log:
> prep for 2.62 release
>[...]
> Modified: incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm
> =========================================================================
>
>--- incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm
> +++ incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm
> @@ -91,14 +91,13 @@ 
>  @ISA = qw();
>>  # SUB_VERSION is now <revision>-<yyyy>-<mm>-<dd>-<state>
> -$SUB_VERSION = lc(join('-', (split(/\s+/, '$Id$'))[2, 3], 'svn'));
> +$SUB_VERSION = (split(/\s+/,'$LastChangedDate: 2004-01-11 14:21:28 -0500
> (Sun, 11 Jan 2004) $ updated by SVN'))[1];
>
>  # If you hacked up your SA, add a token to identify it here. Eg.: I use
>  # "mss<number>", <number> increasing with every hack.
>  @EXTRA_VERSION = qw();
> -
>  if (defined $IS_DEVEL_BUILD && $IS_DEVEL_BUILD) {
> -  push(@EXTRA_VERSION, 'cvs');
> +  push(@EXTRA_VERSION, ( 'r' . qw{$LastChangedRevision: 6141 $ updated
> by SVN}[1] )); }
>
>  sub Version { join('-', $VERSION, @EXTRA_VERSION) }

This is what caused bug 2938. I think the best idea is to revert this part 
of the commit and replace 2.62 with a version 2.62-56 or something. I don't 
think it's worth releasing a 2.63 just for this small fix, but we need to 
keep the 5.006 compat.

FYI, if you use and $Variables$ with Subversion, you have to explicitly set 
the svn:keywords property on the files where those vars should be expanded. 
See the SVNbook or compare the output of 'svn proplist -v SpamAssassin.pm' 
in HEAD and the branch.

Cheers,
Malte

-- 
[SGT] Simon G. Tatham: "How to Report Bugs Effectively"
      <http://www.chiark.greenend.org.uk/~sgtatham/bugs.html>
[ESR] Eric S. Raymond: "How To Ask Questions The Smart Way"
      <http://www.catb.org/~esr/faqs/smart-questions.html>

Reply via email to