Attachment 8925 Details for Bug 9909 – Proposed patch written by obnox

[patch] Proposed patch written by obnox

0001-wafsamba.py-Add-missing-new-line-to-fix-python-sheba.patch (text/plain), 1.10 KB, created by Karolin Seeger on 2013-05-28 10:35:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karolin Seeger

Created: 2013-05-28 10:35:55 UTC

Size: 1.10 KB

patch

obsolete

>From fb9334099771e6e4d50715f3c5dedce1866a6e0d Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Tue, 28 May 2013 12:19:34 +0200
>Subject: [PATCH] wafsamba.py: Add missing new line to fix python shebang.
>
>That fixes e.g. samba_spnupdate on some systems.
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Signed-off-by: Karolin Seeger <kseeger@samba.org>
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 3559cc1..8eace08 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -699,9 +699,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))
>-- 
>1.7.10.4
>

Flags:

metze: review+

Actions: View

Attachments on bug 9909: 8925