diff options
| author | Jose <jose@zeroc.com> | 2014-09-10 22:25:18 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-09-10 22:25:18 +0200 |
| commit | 81e646e7488600f239a99cd4b2e28a28d985ee47 (patch) | |
| tree | b6b43e056b3519cd3ce3ca7c93ff48001a3b4735 /distribution/lib/DistUtils.py | |
| parent | Merge branch 'master' of ssh://git.zeroc.com/home/git/ice (diff) | |
| download | ice-81e646e7488600f239a99cd4b2e28a28d985ee47.tar.bz2 ice-81e646e7488600f239a99cd4b2e28a28d985ee47.tar.xz ice-81e646e7488600f239a99cd4b2e28a28d985ee47.zip | |
Fixed (ICE-5672) Makedist.py does not handle git version with 4 degrees.
Diffstat (limited to 'distribution/lib/DistUtils.py')
| -rw-r--r-- | distribution/lib/DistUtils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/distribution/lib/DistUtils.py b/distribution/lib/DistUtils.py index ed0ff14460a..2bad53191b5 100644 --- a/distribution/lib/DistUtils.py +++ b/distribution/lib/DistUtils.py @@ -108,7 +108,7 @@ def remove(path, recurse = True): def checkGitVersion(): # Ensure we're using git >= 1.8.3 p = os.popen("git --version") - gitVersionMatch = re.search(".* ([0-9]+)\.([0-9b]+)\.([\.0-9]*)", p.read()) + gitVersionMatch = re.search(".* ([0-9]+)\.([0-9b]+)\.([0-9]+).*", p.read()) p.close() version = (int(gitVersionMatch.group(1)) * 10000) + \ |