Fix typing errors

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 5423df18064182e007ae0e2046908707bb3cf5b5..36e11036c721d1f45d3a1e1c81cd55779c30863b 100644 (file)
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -14,7 +14,6 @@ import tempfile
 import uuid
 from collections.abc import Iterator
 from pathlib import Path
-from typing import Optional
 
 from mkosi.architecture import Architecture
 from mkosi.config import (
@@ -138,7 +137,7 @@ def find_ovmf_vars(config: MkosiConfig) -> Path:
 
 
 @contextlib.contextmanager
-def start_swtpm() -> Iterator[Optional[Path]]:
+def start_swtpm() -> Iterator[Path]:
     with tempfile.TemporaryDirectory() as state:
         sock = Path(state) / Path("sock")
         proc = spawn([

diff --git a/mkosi/run.py b/mkosi/run.py
index 0637124092384c9c08cf3024d4ec083c9ad49e1c..d17f54b60a63b38b8bed3b76da51d0c29c637629 100644 (file)
--- a/mkosi/run.py
+++ b/mkosi/run.py
@@ -178,11 +178,12 @@ def run(
         # output.
         stdout = sys.stderr
 
-    env = dict(
-        PATH=os.environ["PATH"],
-        TERM=os.getenv("TERM", "vt220"),
-        LANG="C.UTF-8",
-    ) | env
+    env = {
+        "PATH": os.environ["PATH"],
+        "TERM": os.getenv("TERM", "vt220"),
+        "LANG": "C.UTF-8",
+        **env,
+    }
 
     if "TMPDIR" in os.environ:
         env["TMPDIR"] = os.environ["TMPDIR"]