summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-15 21:45:42 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-15 11:33:41 +0000
commit88d694ac8e808a22495dcdd6af181f4738c1f21c (patch)
treea811eaea3cfa55bb278fa6206f1f724ef1e0e452 /buildtools
parente409db9da170ae24e3806ccf87d411b42e582945 (diff)
downloadsamba-88d694ac8e808a22495dcdd6af181f4738c1f21c.tar.gz
samba-88d694ac8e808a22495dcdd6af181f4738c1f21c.tar.bz2
samba-88d694ac8e808a22495dcdd6af181f4738c1f21c.zip
waf: fixed configure again on RHEL5
the fancier cmd_output() broke git versioning Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Mon Nov 15 11:33:41 UTC 2010 on sn-devel-104
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_version.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 69f36eb4e1..e6a6ccf28f 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -49,7 +49,7 @@ def git_version_summary(path, have_git):
if not have_git:
return ("GIT-UNKNOWN", {})
- git = Utils.cmd_output(env={"GIT_DIR": "%s/.git" % path}, cmd=["git", "show", '--pretty=format:%h%n%ct%n%H%n%cd', "--stat", "HEAD"])
+ git = Utils.cmd_output('git show --pretty=format:"%h%n%ct%n%H%n%cd" --stat HEAD', silent=True)
lines = git.splitlines()
fields = {