summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-27 09:46:27 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:09 +1000
commit11ca0c7b9d49d7f6723119758262230fe4f568f2 (patch)
treec8ad69f4af8988a9fa613e6bd2f8030daa20406c /buildtools
parentcfeaed22c5974fc9fd0349a28283a5ca94238dfe (diff)
downloadsamba-11ca0c7b9d49d7f6723119758262230fe4f568f2.tar.gz
samba-11ca0c7b9d49d7f6723119758262230fe4f568f2.tar.bz2
samba-11ca0c7b9d49d7f6723119758262230fe4f568f2.zip
build: fixed EXPAND_VARIABLES() for env expansion
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_utils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 1b21d7308c..753a6a7034 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -361,7 +361,7 @@ def EXPAND_VARIABLES(ctx, varstr, vars=None):
ret = SUBST_VARS_RECURSIVE(ret, env)
# if anything left, subst on the environment as well
- if ret.find('${'):
+ if ret.find('${') != -1:
ret = SUBST_VARS_RECURSIVE(ret, ctx.env)
# make sure there is nothing left. Also check for the common
# typo of $( instead of ${
@@ -417,3 +417,4 @@ except:
Utils.md5 = replace_md5
Task.md5 = replace_md5
Utils.h_file = replace_h_file
+