diff options
| author | Kali Kaneko <kali@leap.se> | 2013-12-17 16:03:35 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-12-17 16:03:35 -0400 |
| commit | 8789e1e662a8b6ef7635bd8eed4f8e3af41ba138 (patch) | |
| tree | 1cc851b8fba84af4f55953eb78da97939b2836cf /client | |
| parent | a28654cae3dd19dd7c73693b19ee26d437de5ddf (diff) | |
| parent | bbf09fcabd311aa91085cedcbd2e9fbbeebc2526 (diff) | |
Merge remote-tracking branch 'chiiph-github/bug/versioneer_windows' into develop
Diffstat (limited to 'client')
| -rw-r--r-- | client/versioneer.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/client/versioneer.py b/client/versioneer.py index b43ab062..18dfd923 100644 --- a/client/versioneer.py +++ b/client/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] @@ -430,7 +430,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: @@ -486,7 +486,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]) |