From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 5 Jul 2022 09:48:39 +0000 (+0200)
Subject: Make sure we extend the parent env instead of overriding it in run()
X-Git-Tag: v14~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ea7442c38538e951222048379dc6c54b85b7318;p=thirdparty%2Fmkosi.git

Make sure we extend the parent env instead of overriding it in run()

This makes sure any environment variables set in the parent env
don't suddenly stop working when we set our own (e.g. proxy env
variables).
---

diff --git a/mkosi/backend.py b/mkosi/backend.py
index 9bf9942de..60a3f7f5b 100644
--- a/mkosi/backend.py
+++ b/mkosi/backend.py
@@ -752,6 +752,7 @@ def run(
     delay_interrupt: bool = True,
     stdout: _FILE = None,
     stderr: _FILE = None,
+    env: Mapping[str, Any] = {},
     **kwargs: Any,
 ) -> CompletedProcess:
     cmdline = [str(x) for x in cmdline]
@@ -776,7 +777,7 @@ def run(
     cm = do_delay_interrupt if delay_interrupt else do_noop
     try:
         with cm():
-            return subprocess.run(cmdline, check=check, stdout=stdout, stderr=stderr, **kwargs)
+            return subprocess.run(cmdline, check=check, stdout=stdout, stderr=stderr, env={**os.environ, **env}, **kwargs)
     except FileNotFoundError:
         die(f"{cmdline[0]} not found in PATH.")