]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
tests: Always pass process environment to mkosi
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 22 Jan 2025 08:58:00 +0000 (09:58 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 22 Jan 2025 13:11:18 +0000 (14:11 +0100)
Let's not override the entire environment when we need some extra
environment variables.

tests/__init__.py

index 1bbaf57845b68891180db23b4d34e23e6e87622c..eb3a5ad1dbc589ea646bc156fbcf00a559329097 100644 (file)
@@ -58,7 +58,7 @@ class Image:
         user: Optional[int] = None,
         group: Optional[int] = None,
         check: bool = True,
-        env: Mapping[str, str] = os.environ,
+        env: Mapping[str, str] = {},
     ) -> CompletedProcess:
         return run(
             [
@@ -74,14 +74,14 @@ class Image:
             stdout=sys.stdout,
             user=user,
             group=group,
-            env=env,
+            env=os.environ | env,
         )  # fmt: skip
 
     def build(
         self,
         options: Sequence[PathString] = (),
         args: Sequence[str] = (),
-        env: Mapping[str, str] = os.environ,
+        env: Mapping[str, str] = {},
     ) -> CompletedProcess:
         kcl = [
             "loglevel=6",