]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Use union operator instead of env unpacking
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 3 Mar 2023 19:22:57 +0000 (20:22 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 3 Mar 2023 19:22:57 +0000 (20:22 +0100)
Avoids issues when the same environment variable is specified more
than once.

mkosi/run.py

index 70a0fa8199c8ba0e34d2bcaf1983c0260aedf6db..1e76189c592e8cdd467fc0cb6e7efe05bcf3711c 100644 (file)
@@ -211,8 +211,7 @@ def run(
         PATH=os.environ["PATH"],
         TERM=os.getenv("TERM", "vt220"),
         LANG="C.UTF-8",
-        **env,
-    )
+    ) | env
 
     try:
         return subprocess.run(cmdline, check=check, stdout=stdout, stderr=stderr, env=env, **kwargs,