From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 1 Nov 2023 11:04:15 +0000 (+0000)
Subject: _pakfire: Remove trailing newline on log messages
X-Git-Tag: 0.9.30~1355
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa1c212551e0b7d08254856d8bdd734e0392f26c;p=pakfire.git

_pakfire: Remove trailing newline on log messages

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/_pakfire/_pakfiremodule.c b/src/_pakfire/_pakfiremodule.c
index af8b40e99..6d5c55802 100644
--- a/src/_pakfire/_pakfiremodule.c
+++ b/src/_pakfire/_pakfiremodule.c
@@ -112,8 +112,12 @@ static void __pakfire_log_callback(void* data, int level, const char* file, int
 	if (r < 0)
 		goto ERROR;
 
+	// Remove trailing newline
+	if (buffer[r - 1] == '\n')
+		r--;
+
 	// Call the logger
-	result = PyObject_CallMethod(logger, "log", "is", level, buffer);
+	result = PyObject_CallMethod(logger, "log", "is#", level, buffer, r);
 	if (!result)
 		goto ERROR;