aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2017-09-07 10:39:21 -0400
committerKevin O'Connor <kevin@koconnor.net>2017-09-07 11:19:27 -0400
commit167a65d82688dd4d02f950d76f2fdce51cb306f8 (patch)
tree94a220f322aaa9183403c3672ec037ac6dec60ab
parentc9cd8cea6647cafeffec8a025bf7773c64dc22b5 (diff)
downloadkutter-167a65d82688dd4d02f950d76f2fdce51cb306f8.tar.gz
kutter-167a65d82688dd4d02f950d76f2fdce51cb306f8.tar.xz
kutter-167a65d82688dd4d02f950d76f2fdce51cb306f8.zip
util: Fix reporting of git version of klippy code
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r--klippy/util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/klippy/util.py b/klippy/util.py
index 2e68dcd1..6c9cad6b 100644
--- a/klippy/util.py
+++ b/klippy/util.py
@@ -54,11 +54,11 @@ def get_cpu_info():
def get_git_version():
# Obtain version info from "git" program
- gitdir = os.path.join(sys.path[0], '..', '.git')
+ gitdir = os.path.join(sys.path[0], '..')
if not os.path.exists(gitdir):
logging.debug("No '.git' file/directory found")
return "?"
- prog = "git --git-dir=%s describe --tags --long --dirty" % (gitdir,)
+ prog = "git -C %s describe --tags --long --dirty" % (gitdir,)
try:
process = subprocess.Popen(shlex.split(prog), stdout=subprocess.PIPE)
output = process.communicate()[0]