Permalink
Browse files

Issue 95: "beta0" added when building from source distribution.

  • Loading branch information...
mkleehammer committed Apr 16, 2010
1 parent 61b7516 commit 9ff534207d9913f703f1be91117b225933f0a9f5
Showing with 3 additions and 2 deletions.
  1. +3 −2 setup.py
View
@@ -172,14 +172,15 @@ def _get_version_pkginfo():
match = re_ver.search(line)
if match:
name = line.split(':', 1)[1].strip()
- numbers = [int(n or 0) for n in match.groups()]
+ numbers = [int(n or 0) for n in match.groups()[:3]]
+ numbers.append(int(match.group(4) or OFFICIAL_BUILD)) # don't use 0 as a default for build
return name, numbers
return None, None
def _get_version_git():
- n, result = getoutput('git describe --tags')
+ n, result = getoutput('git describe --tags --match 2.*')
if n:
print 'WARNING: git describe failed with: %s %s' % (n, result)
return None, None

0 comments on commit 9ff5342

Please sign in to comment.