don't use '--dirty' in git invocations, since older gits don't suppor…

…t it
buildbot · Oct 1, 2010 · 84ea252 · 84ea252
1 parent bfea855
commit 84ea252
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/master/buildbot/__init__.py b/master/buildbot/__init__.py
@@ -12,13 +12,13 @@
     version = open(fn).read().strip()
 
 except IOError:
-    from subprocess import Popen, PIPE
+    from subprocess import Popen, PIPE, STDOUT
     import re
 
     VERSION_MATCH = re.compile(r'\d+\.\d+\.\d+(\w|-)*')
 
     try:
-        p = Popen(['git', 'describe', '--tags', '--always', '--dirty'], stdout=PIPE)
+        p = Popen(['git', 'describe', '--tags', '--always'], stdout=PIPE, stderr=STDOUT)
         out = p.communicate()[0]
 
         if (not p.returncode) and out:

diff --git a/slave/buildslave/__init__.py b/slave/buildslave/__init__.py
@@ -12,13 +12,13 @@
     version = open(fn).read().strip()
 
 except IOError:
-    from subprocess import Popen, PIPE
+    from subprocess import Popen, PIPE, STDOUT
     import re
 
     VERSION_MATCH = re.compile(r'\d+\.\d+\.\d+(\w|-)*')
 
     try:
-        p = Popen(['git', 'describe', '--tags', '--always', '--dirty'], stdout=PIPE)
+        p = Popen(['git', 'describe', '--tags', '--always'], stdout=PIPE, stderr=STDOUT)
         out = p.communicate()[0]
 
         if (not p.returncode) and out: