From 11ca0c7b9d49d7f6723119758262230fe4f568f2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 27 Mar 2010 09:46:27 +1100
Subject: build: fixed EXPAND_VARIABLES() for env expansion

---
 buildtools/wafsamba/samba_utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
+
-- 
cgit