[Pkg-mozext-commits] [adblock-plus] 119/464: Fixed: Don't need to append + to the version number for development builds if version number is something like 1.2.3a2

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit bbdf58a1f53d24be9d5e95f4859bd7e7b548ddb7
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Fri Jan 7 23:36:38 2011 +0100

    Fixed: Don't need to append + to the version number for development builds if version number is something like 1.2.3a2
---
 Packager.pm      | 2 +-
 make_devbuild.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Packager.pm b/Packager.pm
index f5011a5..c0633bb 100644
--- a/Packager.pm
+++ b/Packager.pm
@@ -83,7 +83,7 @@ sub readMetadata
   $self->{version} = $self->{settings}{general}{version};
   if (exists $self->{devbuild})
   {
-    unless ($self->{version} =~ /\D$/)
+    unless ($self->{version} =~ /[^\d\.]\d*$/)
     {
       $self->{version} .= ".0" while ($self->{version} =~ tr/././ < 2);
       $self->{version} .= "+";
diff --git a/make_devbuild.pl b/make_devbuild.pl
index 36baeea..d9ed02a 100644
--- a/make_devbuild.pl
+++ b/make_devbuild.pl
@@ -30,7 +30,7 @@ $pkg->readMetadata('metadata');
 my $baseName = $pkg->{settings}{general}{basename};
 my $version = $pkg->{version};
 
-unless ($version =~ /\D$/)
+unless ($version =~ /[^\d\.]\d*$/)
 {
   # Pad the version with zeroes to get version comparisons
   # right (1.2+ > 1.2.1 but 1.2.0+ < 1.2.1)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git