[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Wed May 29 05:22:02 MDT 2013
The branch, master has been updated
via 3f24d69 build: Add missing new line to replaced python shebang line. (Fix bug #9909)
from 886f062 s4-torture: Always compile backupkey ndr testsuite.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3f24d694e7e2190d30a17bc13a79a36b49711531
Author: Michael Adam <obnox at samba.org>
Date: Tue May 28 12:19:34 2013 +0200
build: Add missing new line to replaced python shebang line. (Fix bug #9909)
When configuring with a non-standard python specified in
the PYTHON environment variable, the shebang lines in various
python tools like samba-tool and samba_dnsupdate get replaced.
This replace line for the shebang was missing a newline
which joined the shebang line with the following line,
rendereing those scripts with a nonempty second line unusuable,
for example samba_dnsupdate.
This patch fixes this bug which is bug #9909 on bugzilla.
Pair-Programmed-With: Karolin Seeger <kseeger at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
Signed-off-by: Karolin Seeger <kseeger at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Wed May 29 13:21:51 CEST 2013 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wafsamba.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 0d407e6..aaa0939 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -704,9 +704,9 @@ sys.path.insert(1, "%s")""" % (task.env["PYTHONARCHDIR"], task.env["PYTHONDIR"])
shebang = None
if task.env["PYTHON"][0] == "/":
- replacement_shebang = "#!%s" % task.env["PYTHON"]
+ replacement_shebang = "#!%s\n" % task.env["PYTHON"]
else:
- replacement_shebang = "#!/usr/bin/env %s" % task.env["PYTHON"]
+ replacement_shebang = "#!/usr/bin/env %s\n" % task.env["PYTHON"]
installed_location=task.outputs[0].bldpath(task.env)
source_file = open(task.inputs[0].srcpath(task.env))
--
Samba Shared Repository
More information about the samba-cvs
mailing list