git.samba.org
/
ira
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e409db9
)
waf: fixed configure again on RHEL5
author
Andrew Tridgell
<tridge@samba.org>
Mon, 15 Nov 2010 10:45:42 +0000
(21:45 +1100)
committer
Andrew Tridgell
<tridge@samba.org>
Mon, 15 Nov 2010 11:33:41 +0000
(11:33 +0000)
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
buildtools/wafsamba/samba_version.py
patch
|
blob
|
history
diff --git
a/buildtools/wafsamba/samba_version.py
b/buildtools/wafsamba/samba_version.py
index 69f36eb4e196cb22f3bc729052749b5b4341de30..e6a6ccf28f7bfcb77e0aa623b162fd8b2ee11b46 100644
(file)
--- 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 = {