0

--version now displays the correct (new-form) version number

This commit is contained in:
Aaron Griffith
2011-12-17 03:20:38 -05:00
parent 2c89cc645b
commit a690771253
2 changed files with 17 additions and 9 deletions

View File

@@ -69,10 +69,17 @@ def findGitVersion():
line = line.split('-', 1)[1]
if line.startswith('v'):
line = line[1:]
# turn 0.1.2-50-somehash into 0.1.2-50
# and 0.1.3 into 0.1.3
line = '-'.join(line.split('-', 2)[:2])
return line.strip()
# turn 0.1.0-50-somehash into 0.1.50
# and 0.1.0 into 0.1.0
line = line.strip().replace('-', '.').split('.')
if len(line) == 5:
del line[4]
del line[2]
else:
assert len(line) == 3
line[2] = '0'
line = '.'.join(line)
return line
except Exception:
try:
import overviewer_version