diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-06-28 13:39:00 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-06-29 14:28:08 +1000 |
| commit | 3774ba350e6b828512e693b982e0927877cd13eb (patch) | |
| tree | 1ab0f728fb3d12a487764a8971fc847b7388cc95 /buildtools | |
| parent | 8cbd36afe84685ee1e289fee11065d3eb0cadc22 (diff) | |
| download | samba-3774ba350e6b828512e693b982e0927877cd13eb.tar.gz samba-3774ba350e6b828512e693b982e0927877cd13eb.tar.bz2 samba-3774ba350e6b828512e693b982e0927877cd13eb.zip | |
build: allow LOAD_ENVIRONMENT() to pass when no configure has been run
this returns an empty environment
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_utils.py | 7 |
1 files changed, 5 insertions, 2 deletions
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 |