From 3f24d694e7e2190d30a17bc13a79a36b49711531 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 28 May 2013 12:19:34 +0200 Subject: 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 Signed-off-by: Michael Adam Signed-off-by: Karolin Seeger Reviewed-by: Andrew Bartlett Autobuild-User(master): Michael Adam Autobuild-Date(master): Wed May 29 13:21:51 CEST 2013 on sn-devel-104 --- buildtools/wafsamba/wafsamba.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 0d407e6a0a..aaa09392f1 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)) -- cgit