From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 17 May 2022 09:45:08 +0000 (+0200)
Subject: machine: Translate \r\n to \n in logfile
X-Git-Tag: v13~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f96ed5b16ad49ffdcc65a413acad5e3949ccc325;p=thirdparty%2Fmkosi.git

machine: Translate \r\n to \n in logfile

Output lines from pexpect sent to the logfile will always end with
"\r\n" (side-effect of working with pseudo-TTYs) . On Github Actions,
this results in blank lines in the test output. Let's add a simple
adapter that translates "\r\n" back to "\n" before actually writing
to the logfile.
---

diff --git a/mkosi/machine.py b/mkosi/machine.py
index 91c97bd15..336746ecf 100644
--- a/mkosi/machine.py
+++ b/mkosi/machine.py
@@ -34,6 +34,17 @@ from . import (
 from .backend import MkosiArgs, MkosiNotSupportedException, Verb, die
 
 
+class LogfileAdapter:
+    def __init__(self, file: TextIO) -> None:
+        self.file = file
+
+    def write(self, s: str) -> None:
+        self.file.write(s.replace("\r\n", "\n"))
+
+    def flush(self) -> None:
+        self.file.flush()
+
+
 class Machine:
     def __init__(self, args: Sequence[str] = []) -> None:
         # Remains None until image is built and booted, then receives pexpect process.
@@ -134,7 +145,7 @@ class Machine:
             # Then we tell the process to look for the # sign, which indicates the CLI for that image is active.
             # Once we've build/boot an image the CLI will prompt "root@image ~]# ".
             # Then, when pexpects finds the '#' it means we're ready to interact with the process.
-            self._serial = pexpect.spawnu(cmd, logfile=sys.stdout, timeout=240)
+            self._serial = pexpect.spawnu(cmd, logfile=LogfileAdapter(sys.stdout), timeout=240)
             self._serial.expect("#")
             self.stack = stack.pop_all()