Attachment 18945 Details for Bug 16057 – backport patch for 4.22, 4.23, 4.24

[patch] backport patch for 4.22, 4.23, 4.24

0001-samba_cross.py-autobuild-fails-with-trailing-space-a.patch (text/plain), 1.36 KB, created by Björn Jacke on 2026-04-12 11:41:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Jacke

Created: 2026-04-12 11:41:13 UTC

Size: 1.36 KB

patch

obsolete

>From 998c7dbe0927b146a4be2aaa07f536ed4c958bb2 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bjacke@samba.org>
>Date: Fri, 10 Apr 2026 12:20:56 +0200
>Subject: [PATCH] samba_cross.py: autobuild fails with trailing space at line
> endings
>
>autobuild fails with trailing space at line endings, so we need to strip() only
>at "\n" here strictly.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=16057
>
>Signed-off-by: Bjoern Jacke <bjacke@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>
>Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
>Autobuild-Date(master): Fri Apr 10 21:20:52 UTC 2026 on atb-devel-224
>
>(cherry picked from commit 2f8dfde1210395175e726455bdb63a7b97245a72)
>---
> buildtools/wafsamba/samba_cross.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py
>index 7ec1edc52ea..189db6b4c53 100644
>--- a/buildtools/wafsamba/samba_cross.py
>+++ b/buildtools/wafsamba/samba_cross.py
>@@ -26,7 +26,7 @@ def add_answer(ca_file, msg, answer):
>     # don't care about its actual content (the tests should
>     # yield one-line output in order to comply with the cross-answer
>     # format)
>-    retstring = retstring.strip()
>+    retstring = retstring.strip("\n")
>     if len(retstring.split('\n')) > 1:
>         retstring = ''
>     answer = (retcode, retstring)
>-- 
>2.41.0
>

Flags:

bjacke: review+

Actions: View

Attachments on bug 16057: 18945