The branch, master has been updated
via 8140182 wafsamba: Eliminate sys.path updating if installing to a
standard python path.
from b4b453a s3: use time_mono throughout in smbget
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8140182f3d53019702f49330a40ffa9d47d8d3df
Author: Jelmer Vernooij <[email protected]>
Date: Wed Sep 8 22:45:12 2010 +0200
wafsamba: Eliminate sys.path updating if installing to a standard python
path.
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wafsamba.py | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 50d0df2..11de9d5 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -594,8 +594,14 @@ def install_file(bld, destdir, file, chmod=0644,
flat=False,
if python_fixup:
# fixup the python path it will use to find Samba modules
inst_file = file + '.inst'
+ if bld.env["PYTHONDIR"] not in sys.path:
+ regex =
"s|\(sys.path.insert.*\)bin/python\(.*\)$|\\1${PYTHONDIR}\\2|g"
+ else:
+ # Eliminate updating sys.path if the target python dir is already
+ # in python path.
+ regex = "s|sys.path.insert.*bin/python.*$||g"
bld.SAMBA_GENERATOR('python_%s' % destname,
- rule="sed
's|\(sys.path.insert.*\)bin/python\(.*\)$|\\1${PYTHONDIR}\\2|g' < ${SRC} >
${TGT}",
+ rule="sed '%s' < ${SRC} > ${TGT}" % regex,
source=file,
target=inst_file)
file = inst_file
--
Samba Shared Repository
