summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-11-27 22:46:37 -0200
committerKali Kaneko <kali@leap.se>2013-11-27 22:46:37 -0200
commit67cf42d6918f6ef9ec9e8a1f2b3257306ab50894 (patch)
treeec1266121381140b82da779c5eff730a275b3666
parentfe5c3113269f86b3c1f82d30d1d25ba5f3421c2d (diff)
parentcbdf89cb96288bb76b5a3583bfddd327a4e283f1 (diff)
Merge remote-tracking branch 'chiiph/bug/versioneer_gitbash' into develop
-rw-r--r--versioneer.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/versioneer.py b/versioneer.py
index 34e48073..885ebcfd 100644
--- a/versioneer.py
+++ b/versioneer.py
@@ -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:
@@ -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