]> git.ipfire.org Git - pbs.git/commitdiff
config: Remove any trailing newlines from Pakfire log messages
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 27 Apr 2023 15:13:06 +0000 (15:13 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 27 Apr 2023 15:13:06 +0000 (15:13 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/buildservice/config.py

index 61c61350d300243857523fbf77bdfa50430fd0f4..caba458697af8335d3f483a4dd3e90f1c37132bb 100644 (file)
@@ -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