From 3774ba350e6b828512e693b982e0927877cd13eb Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 28 Jun 2010 13:39:00 +1000 Subject: build: allow LOAD_ENVIRONMENT() to pass when no configure has been run this returns an empty environment --- buildtools/wafsamba/samba_utils.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'buildtools/wafsamba/samba_utils.py') diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index 79b0ca3f5a..304264b363 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -397,8 +397,11 @@ def LOAD_ENVIRONMENT(): from new commands''' import Environment env = Environment.Environment() - env.load('.lock-wscript') - env.load(env.blddir + '/c4che/default.cache.py') + try: + env.load('.lock-wscript') + env.load(env.blddir + '/c4che/default.cache.py') + except: + pass return env -- cgit