From 88d694ac8e808a22495dcdd6af181f4738c1f21c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 15 Nov 2010 21:45:42 +1100 Subject: [PATCH] waf: fixed configure again on RHEL5 the fancier cmd_output() broke git versioning Autobuild-User: Andrew Tridgell Autobuild-Date: Mon Nov 15 11:33:41 UTC 2010 on sn-devel-104 --- buildtools/wafsamba/samba_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py index 69f36eb4e19..e6a6ccf28f7 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 = { -- 2.34.1