[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Tue Jul 24 08:43:02 MDT 2012


The branch, master has been updated
       via  d00d206 waf: Update to newer upstream snapshot.
      from  867de2f s3-pdb: remove unused variables.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d00d20626f54e87c5d51624eae6be334b88eb49a
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jul 24 21:40:35 2012 +1000

    waf: Update to newer upstream snapshot.
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Tue Jul 24 16:42:44 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafadmin/Tools/python.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafadmin/Tools/python.py b/buildtools/wafadmin/Tools/python.py
index 511cf09..c2af312 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


-- 
Samba Shared Repository


More information about the samba-cvs mailing list