From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 27 Apr 2023 15:13:06 +0000 (+0000)
Subject: config: Remove any trailing newlines from Pakfire log messages
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db548d43f907554827ff6ec89c1de09fca1855f0;p=pbs.git

config: Remove any trailing newlines from Pakfire log messages

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

diff --git a/src/buildservice/config.py b/src/buildservice/config.py
index 61c61350..caba4586 100644
--- a/src/buildservice/config.py
+++ b/src/buildservice/config.py
@@ -41,6 +41,13 @@ class PakfireConfig(base.Object):
 
 		return buffer.getvalue()
 
+	def _log(self, level, message):
+		# Remove any trailing newline (but only one)
+		if message:
+			message = message.removesuffix("\n")
+
+		return log.log(level, message)
+
 	# Repositories
 
 	def add_repo(self, repo):
@@ -64,7 +71,7 @@ class PakfireConfig(base.Object):
 			t.flush()
 
 			# Launch a new Pakfire instance
-			return pakfire.Pakfire(conf=t.name, logger=log.log, offline=False)
+			return pakfire.Pakfire(conf=t.name, logger=self._log, offline=False)
 
 	def __exit__(self, type, value, traceback):
 		pass