From 45af495695a83636e79a810e212542d7c292a9ac Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 12 Nov 2010 17:18:30 +0100 Subject: samba_version: Cope with building snapshots in directories without git checkout. Error out when run in a git checkout in which git fails. --- buildtools/wafsamba/samba_version.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py index bddf917ba2..bbd6439efc 100644 --- a/buildtools/wafsamba/samba_version.py +++ b/buildtools/wafsamba/samba_version.py @@ -1,3 +1,4 @@ +import os import Utils def git_version_summary(have_git): @@ -90,7 +91,11 @@ also accepted as dictionary entries here SAMBA_VERSION_STRING += ("rc%u" % self.RC_RELEASE) if self.IS_SNAPSHOT: - suffix, self.vcs_fields = git_version_summary(have_git) + if os.path.exists(".git"): + suffix, self.vcs_fields = git_version_summary(have_git) + else: + suffix = "UNKNOWN" + self.vcs_fields = {} SAMBA_VERSION_STRING += "-" + suffix else: self.vcs_fields = {} -- cgit