svn commit: r1128544 - in /spamassassin/trunk: lib/Mail/SpamAssassin.pm sa-update.raw

[km...@apache.org]

Author: kmcgrail
Date: Sat May 28 01:02:24 2011
New Revision: 1128544

URL: http://svn.apache.org/viewvc?rev=1128544&view=rev
Log:
SVN Keyword handling improvement bug 6605

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin.pm
    spamassassin/trunk/sa-update.raw

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=1128544&r1=1128543&r2=1128544&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Sat May 28 01:02:24 2011
@@ -104,11 +104,22 @@ $IS_DEVEL_BUILD = 1;        # change for
 @ISA = qw();
 
 # SUB_VERSION is now just <yyyy>-<mm>-<dd>
-$SUB_VERSION = (split(/\s+/,'$LastChangedDate$ updated by SVN'))[1];
+$SUB_VERSION = 'svnunknown';
+if ('$LastChangedDate$' =~ ':') {
+  # Subversion keyword "$LastChangedDate$" has been successfully expanded.
+  # Doesn't happen with automated launchpad builds:
+  # https://bugs.launchpad.net/launchpad/+bug/780916
+  $SUB_VERSION = (split(/\s+/,'$LastChangedDate$ updated by SVN'))[1];
+}
+
 
 if (defined $IS_DEVEL_BUILD && $IS_DEVEL_BUILD) {
-  push(@EXTRA_VERSION,
-       ('r' . qw{$LastChangedRevision$ updated by SVN}[1]));
+  if ('$LastChangedRevision$' =~ ':') {
+    # Subversion keyword "$LastChangedRevision$" has been successfully expanded.
+    push(@EXTRA_VERSION, ('r' . qw{$LastChangedRevision$ updated by SVN}[1]));
+  } else {
+    push(@EXTRA_VERSION, ('r' . 'svnunknown'));
+  }
 }
 
 sub Version {

Modified: spamassassin/trunk/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-update.raw?rev=1128544&r1=1128543&r2=1128544&view=diff
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Sat May 28 01:02:24 2011
@@ -17,8 +17,14 @@
 # limitations under the License.
 # </...@LICENSE>
 
-my $VERSION = 'svn' . (split(/\s+/,
-	'$Id$'))[2];
+my $VERSION = 'svnunknown';
+if ('$Id$' =~ ':') {
+  # Subversion keyword "$Id$" has been successfully expanded.
+  # Doesn't happen with automated launchpad builds:
+  # https://bugs.launchpad.net/launchpad/+bug/780916
+  $VERSION = 'svn' . (split(/\s+/, '$Id$'))[2];
+}
+
 
 my $PREFIX          = '@@PREFIX@@';             # substituted at 'make' time
 my $DEF_RULES_DIR   = '@@DEF_RULES_DIR@@';      # substituted at 'make' time