diff options
| author | Michael Adam <obnox@samba.org> | 2013-05-28 12:19:34 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-05-29 13:21:51 +0200 |
| commit | 3f24d694e7e2190d30a17bc13a79a36b49711531 (patch) | |
| tree | f9921af5ca41814f87c950b981cdf610f182fa7b /buildtools | |
| parent | 886f062e72f8ad9cddfe5fab4b2b1a36be0ea30b (diff) | |
| download | samba-3f24d694e7e2190d30a17bc13a79a36b49711531.tar.gz | |
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@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Wed May 29 13:21:51 CEST 2013 on sn-devel-104
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 0d407e6a0a6..aaa09392f1e 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)) |