summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-07-24 21:40:35 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-07-24 16:42:44 +0200
commitd00d20626f54e87c5d51624eae6be334b88eb49a (patch)
tree13ca0b998a5272ea2e737129d8f5dbb8c77651cf
parent867de2f3aaa269e5063ae99d6cb77a6e9d20cf67 (diff)
downloadsamba-d00d20626f54e87c5d51624eae6be334b88eb49a.tar.gz
samba-d00d20626f54e87c5d51624eae6be334b88eb49a.tar.bz2
samba-d00d20626f54e87c5d51624eae6be334b88eb49a.zip
waf: Update to newer upstream snapshot.
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Tue Jul 24 16:42:44 CEST 2012 on sn-devel-104
-rw-r--r--buildtools/wafadmin/Tools/python.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafadmin/Tools/python.py b/buildtools/wafadmin/Tools/python.py
index 511cf09141..c2af3123f7 100644
--- a/buildtools/wafadmin/Tools/python.py
+++ b/buildtools/wafadmin/Tools/python.py
@@ -136,8 +136,8 @@ def _get_python_variables(python_exe, variables, imports=['import sys']):
continue
if s == 'None':
return_values.append(None)
- elif s[0] == "'" and s[-1] == "'":
- return_values.append(s[1:-1])
+ elif (s[0] == "'" and s[-1] == "'") or (s[0] == '"' and s[-1] == '"'):
+ return_values.append(eval(s))
elif s[0].isdigit():
return_values.append(int(s))
else: break