]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Always use TERM=dumb if not connected to a tty 2646/head
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 21 Apr 2024 09:20:09 +0000 (11:20 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 21 Apr 2024 09:28:34 +0000 (11:28 +0200)
mkosi might be invoked from a terminal but redirected to a file, in
that case we should ignore $TERM from the environment, so let's make
sure we handle that properly.

mkosi/config.py

index cccbcdf9e33f6d45464015f09535dc1183f9ac10..6bb2441e87223067d5410ea021edf979011503e9 100644 (file)
@@ -3697,10 +3697,11 @@ def load_credentials(args: argparse.Namespace) -> dict[str, str]:
 
 
 def finalize_term() -> str:
-    if not (term := os.getenv("TERM")) or term == "unknown":
+    term = os.getenv("TERM", "unknown")
+    if term == "unknown":
         term = "vt220" if sys.stderr.isatty() else "dumb"
 
-    return term
+    return term if sys.stderr.isatty() else "dumb"
 
 
 def load_kernel_command_line_extra(args: argparse.Namespace) -> list[str]: