[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  98bd0d1 waf: Update to newer upstream snapshot.
       via  eacb77b update-waf.sh: make mktemp happy by including anything Xes.
       via  ce10a7a lib/util: Fix typo in comment.
      from  ec60944 make librpc/build_idl.sh more portable

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


- Log -----------------------------------------------------------------
commit 98bd0d18db0ff6f08b38d409528a9e15b0d5b560
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Jun 14 23:02:28 2012 +0200

    waf: Update to newer upstream snapshot.
    
    Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date(master): Fri Jun 15 03:12:35 CEST 2012 on sn-devel-104

commit eacb77bb927d1895525967eba154eaf76db8344c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Jun 14 23:02:06 2012 +0200

    update-waf.sh: make mktemp happy by including anything Xes.

commit ce10a7a673e8adf7cda0a136ea3421e3a0ca6033
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun May 13 03:29:48 2012 +0200

    lib/util: Fix typo in comment.

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

Summary of changes:
 buildtools/update-waf.sh            |    2 +-
 buildtools/wafadmin/Tools/python.py |   20 +++++++++++---------
 lib/util/charset/convert_string.c   |    2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/update-waf.sh b/buildtools/update-waf.sh
index c368f5a..277111f 100755
--- a/buildtools/update-waf.sh
+++ b/buildtools/update-waf.sh
@@ -2,7 +2,7 @@
 # Update our copy of waf
 
 TARGETDIR="`dirname $0`"
-WORKDIR="`mktemp -d -t update-waf`"
+WORKDIR="`mktemp -d -t update-waf-XXXXXX`"
 
 mkdir -p "$WORKDIR"
 
diff --git a/buildtools/wafadmin/Tools/python.py b/buildtools/wafadmin/Tools/python.py
index 4f73081..511cf09 100644
--- a/buildtools/wafadmin/Tools/python.py
+++ b/buildtools/wafadmin/Tools/python.py
@@ -6,9 +6,9 @@
 "Python support"
 
 import os, sys
-import TaskGen, Utils, Utils, Runner, Options, Build
+import TaskGen, Utils, Options
 from Logs import debug, warn, info
-from TaskGen import extension, taskgen, before, after, feature
+from TaskGen import extension, before, after, feature
 from Configure import conf
 
 EXT_PY = ['.py']
@@ -173,7 +173,7 @@ def check_python_headers(conf, mandatory=True):
 		(python_prefix, python_SO, python_SYSLIBS, python_LDFLAGS, python_SHLIBS,
 		 python_LIBDIR, python_LIBPL, INCLUDEPY, Py_ENABLE_SHARED,
 		 python_MACOSX_DEPLOYMENT_TARGET) = \
-			_get_python_variables(python, ["get_config_var('%s')" % x for x in v],
+			_get_python_variables(python, ["get_config_var('%s') or ''" % x for x in v],
 					      ['from distutils.sysconfig import get_config_var'])
 	except RuntimeError:
 		conf.fatal("Python development headers not found (-v for details).")
@@ -310,7 +310,7 @@ def check_python_version(conf, minver=None):
 	# Get python version string
 	cmd = [python, "-c", "import sys\nfor x in sys.version_info: print(str(x))"]
 	debug('python: Running python command %r' % cmd)
-	proc = Utils.pproc.Popen(cmd, stdout=Utils.pproc.PIPE)
+	proc = Utils.pproc.Popen(cmd, stdout=Utils.pproc.PIPE, shell=False)
 	lines = proc.communicate()[0].split()
 	assert len(lines) == 5, "found %i lines, expected 5: %r" % (len(lines), lines)
 	pyver_tuple = (int(lines[0]), int(lines[1]), int(lines[2]), lines[3], int(lines[4]))
@@ -329,14 +329,14 @@ def check_python_version(conf, minver=None):
 			if sys.platform == 'win32':
 				(python_LIBDEST, pydir) = \
 						_get_python_variables(python,
-											  ["get_config_var('LIBDEST')",
-											   "get_python_lib(standard_lib=0, prefix=%r)" % conf.env['PREFIX']],
+											  ["get_config_var('LIBDEST') or ''",
+											   "get_python_lib(standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']],
 											  ['from distutils.sysconfig import get_config_var, get_python_lib'])
 			else:
 				python_LIBDEST = None
 				(pydir,) = \
 						_get_python_variables(python,
-											  ["get_python_lib(standard_lib=0, prefix=%r)" % conf.env['PREFIX']],
+											  ["get_python_lib(standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']],
 											  ['from distutils.sysconfig import get_config_var, get_python_lib'])
 			if python_LIBDEST is None:
 				if conf.env['LIBDIR']:
@@ -348,7 +348,7 @@ def check_python_version(conf, minver=None):
 			pyarchdir = conf.environ['PYTHONARCHDIR']
 		else:
 			(pyarchdir,) = _get_python_variables(python,
-											["get_python_lib(plat_specific=1, standard_lib=0, prefix=%r)" % conf.env['PREFIX']],
+											["get_python_lib(plat_specific=1, standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']],
 											['from distutils.sysconfig import get_config_var, get_python_lib'])
 			if not pyarchdir:
 				pyarchdir = pydir
@@ -390,8 +390,10 @@ def detect(conf):
 	if not python:
 		conf.fatal('Could not find the path of the python executable')
 
-	v = conf.env
+	if conf.env.PYTHON != sys.executable:
+		warn("python executable '%s' different from sys.executable '%s'" % (conf.env.PYTHON, sys.executable))
 
+	v = conf.env
 	v['PYCMD'] = '"import sys, py_compile;py_compile.compile(sys.argv[1], sys.argv[2])"'
 	v['PYFLAGS'] = ''
 	v['PYFLAGS_OPT'] = '-O'
diff --git a/lib/util/charset/convert_string.c b/lib/util/charset/convert_string.c
index 4f9917e..2e66680 100644
--- a/lib/util/charset/convert_string.c
+++ b/lib/util/charset/convert_string.c
@@ -340,7 +340,7 @@ bool convert_string_handle(struct smb_iconv_handle *ic,
  *
  * Ensure the srclen contains the terminating zero.
  *
- * I hate the goto's in this function. It's embarressing.....
+ * I hate the goto's in this function. It's emberrassing.....
  * There has to be a cleaner way to do this. JRA.
  */
 bool convert_string_talloc_handle(TALLOC_CTX *ctx, struct smb_iconv_handle *ic,


-- 
Samba Shared Repository