From 5d672b9a530e79aff2a7791df82893bcd50d6233 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 18 May 2015 17:37:51 +0000 Subject: Factor out function for finding Git binary. Signed-Off-By: Jelmer Vernooij Reviewed-by: Andrew Bartlett --- buildtools/wafsamba/samba_version.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'buildtools/wafsamba/samba_version.py') diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py index 1f5be49033d..bb0be96f869 100644 --- a/buildtools/wafsamba/samba_version.py +++ b/buildtools/wafsamba/samba_version.py @@ -1,17 +1,16 @@ import os import Utils import samba_utils -import sys +from samba_git import find_git 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" + git = find_git(env) - if not 'GIT' in env: + if git is None: return ("GIT-UNKNOWN", {}) + env.GIT = git + environ = dict(os.environ) environ["GIT_DIR"] = '%s/.git' % path environ["GIT_WORK_TREE"] = path -- cgit v1.2.1