summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-11-12 17:54:41 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-11-12 17:42:13 +0000
commit7b964c72698054337e1c40df23550edad96de8b5 (patch)
tree44d7294a925a750a556bfa121839e218977bb205 /source3
parenta0c2040ab698c8f053d12b4f53b0ac76a8f5ebac (diff)
downloadsamba-7b964c72698054337e1c40df23550edad96de8b5.tar.gz
samba-7b964c72698054337e1c40df23550edad96de8b5.tar.bz2
samba-7b964c72698054337e1c40df23550edad96de8b5.zip
samba_version: When working from git checkout, display git revision SHA1 rather
than Bazaar revision ids.
Diffstat (limited to 'source3')
-rw-r--r--source3/wscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/wscript b/source3/wscript
index 5bab1a1820..1164ff1d70 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -21,7 +21,7 @@ def load_version(have_git=False):
if not have_git:
env = samba_utils.LOAD_ENVIRONMENT()
have_git = 'GIT' in env
- version = wafsamba.samba_version_file("./VERSION", have_git=have_git)
+ version = wafsamba.samba_version_file("./VERSION", "..", have_git=have_git)
Utils.g_module.VERSION = version.STRING
return version