diff options
| author | Kali Kaneko <kali@leap.se> | 2013-12-17 16:02:42 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-12-17 16:02:42 -0400 |
| commit | 183253c9a9d2e2cae8467c1c4115d129e9a49d65 (patch) | |
| tree | 8f3e3d86afabb43cc7211b9f30081474b1142213 | |
| parent | bfd2489f12fbc0d944d43d66ed7f09e0f3881ecc (diff) | |
| parent | 7e81556f983023e4ba259bc5ef360a940d6ca533 (diff) | |
Merge remote-tracking branch 'chiiph/bug/versioneer_windows' into develop
| -rw-r--r-- | keymanager/versioneer.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/keymanager/versioneer.py b/keymanager/versioneer.py index 34e4807..4e2c0a5 100644 --- a/keymanager/versioneer.py +++ b/keymanager/versioneer.py @@ -115,7 +115,7 @@ import sys def run_command(args, cwd=None, verbose=False): try: - # remember shell=False, so use git.cmd on windows, not just git + # remember shell=False, so use git.exe on windows, not just git p = subprocess.Popen(args, stdout=subprocess.PIPE, cwd=cwd) except EnvironmentError: e = sys.exc_info()[1] @@ -230,7 +230,7 @@ def versions_from_vcs(tag_prefix, versionfile_source, verbose=False): GIT = "git" if sys.platform == "win32": - GIT = "git.cmd" + GIT = "git.exe" stdout = run_command([GIT, "describe", "--tags", "--dirty", "--always"], cwd=root) if stdout is None: @@ -305,7 +305,7 @@ import sys def run_command(args, cwd=None, verbose=False): try: - # remember shell=False, so use git.cmd on windows, not just git + # remember shell=False, so use git.exe on windows, not just git p = subprocess.Popen(args, stdout=subprocess.PIPE, cwd=cwd) except EnvironmentError: e = sys.exc_info()[1] @@ -420,7 +420,7 @@ def versions_from_vcs(tag_prefix, versionfile_source, verbose=False): GIT = "git" if sys.platform == "win32": - GIT = "git.cmd" + GIT = "git.exe" stdout = run_command([GIT, "describe", "--tags", "--dirty", "--always"], cwd=root) if stdout is None: @@ -476,7 +476,7 @@ import sys def do_vcs_install(versionfile_source, ipy): GIT = "git" if sys.platform == "win32": - GIT = "git.cmd" + GIT = "git.exe" run_command([GIT, "add", "versioneer.py"]) run_command([GIT, "add", versionfile_source]) run_command([GIT, "add", ipy]) @@ -489,13 +489,13 @@ def do_vcs_install(versionfile_source, ipy): present = True f.close() except EnvironmentError: - pass + pass if not present: f = open(".gitattributes", "a+") f.write("%s export-subst\n" % versionfile_source) f.close() run_command([GIT, "add", ".gitattributes"]) - + SHORT_VERSION_PY = """ # This file was generated by 'versioneer.py' (0.7+) from |