From 8140182f3d53019702f49330a40ffa9d47d8d3df Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 8 Sep 2010 22:45:12 +0200 Subject: [PATCH] wafsamba: Eliminate sys.path updating if installing to a standard python path. --- buildtools/wafsamba/wafsamba.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 50d0df24a09..11de9d5dccb 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 -- 2.34.1