Browse files

Bug 712753: Fix version handling for release sanity. r=bhearsum

  • Loading branch information...
1 parent 4415699 commit 29ea8c2759723ecb977b6b7cb18e644ce348c608 @catlee catlee committed Dec 21, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/python/build/versions.py
  2. +1 −1 lib/python/release/versions.py
View
2 lib/python/build/versions.py
@@ -8,7 +8,7 @@ class BuildVersionsException(Exception):
# Regex that matches all possible versions and milestones
ANY_VERSION_REGEX =\
- ('\d\.\d[\d\.]*' # A version number
+ ('\d+\.\d[\d\.]*' # A version number
'([a-zA-Z]+\d+)?' # Might be a project branch
'((a|b)\d+)?' # Might be an alpha or beta
'(pre)?') # Might be a 'pre' (nightly) version
View
2 lib/python/release/versions.py
@@ -20,7 +20,7 @@ def getL10nDashboardVersion(version, product):
parsed = re.match(ANY_VERSION_REGEX, version)
if parsed.group(1) and parsed.group(1).startswith('b'):
- ret = '%s%s_beta_%s' % (ret, version[0], parsed.group(1))
+ ret = '%s%s_beta_%s' % (ret, version.split(".")[0], parsed.group(1))
else:
ret += version
return ret

0 comments on commit 29ea8c2

Please sign in to comment.