sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

build: fixed 'make dist' without configuring

Browse Source 
this finds git inside samba_version.py

thanks to Simo for noticing this problem

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Wed Feb 23 07:55:28 CET 2011 on sn-devel-104
This commit is contained in:
Andrew Tridgell 2011-02-23 17:10:10 +11:00
parent 0a6e0edc04
commit 4f48a28c3c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildtools/wafsamba/samba_version.py
View File

@ -52,6 +52,10 @@ def bzr_version_summary(path):
def git_version_summary(path, env=None):
# Get version from GIT
if not 'GIT' in env and os.path.exists("/usr/bin/git"):
# this is useful when doing make dist without configuring
env.GIT = "/usr/bin/git"
if not 'GIT' in env:
return ("GIT-UNKNOWN", {})
@ -74,7 +78,7 @@ def git_version_summary(path, env=None):
ret = "GIT-" + fields["GIT_COMMIT_ABBREV"]
if env.GIT_LOCAL_CHANGES:
clean = Utils.cmd_output('git diff HEAD | wc -l', silent=True).strip()
clean = Utils.cmd_output('%s diff HEAD | wc -l' % env.GIT, silent=True).strip()
if clean == "0":
fields["COMMIT_IS_CLEAN"] = 1
else: