Merge master changes into rewrite

2012-02-23 19:42:50 -05:00
parent ae820079d1 d17931c112
commit b98dcab2d9
13 changed files with 146 additions and 3 deletions
--- a/overviewer_core/util.py
+++ b/overviewer_core/util.py
@@ -64,7 +64,7 @@ def findGitHash():

 def findGitVersion():
    try:
-        p = Popen(['git', 'describe', '--tags'], stdout=PIPE, stderr=PIPE)
+        p = Popen(['git', 'describe', '--tags'], stdout=PIPE, stderr=PIPE, shell=True)
        p.stderr.close()
        line = p.stdout.readlines()[0]
        if line.startswith('release-'):