Bugfix: RealShellExecutor now passes the environment vars from the ho…

…st on get_output(), too
daniel-kun · Nov 5, 2020 · 2f8a1c8 · 2f8a1c8
1 parent 1b0d7a3
commit 2f8a1c8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/kubedev/kubedev.py b/kubedev/kubedev.py
@@ -77,7 +77,7 @@ def execute(self, commandWithArgs: list, envVars: dict = dict(), piped_input: st
   def get_output(self, commandWithArgs, envVars: dict = dict(), check=True):
     cmds = [cmd for cmd in commandWithArgs if cmd is not None]
     print(f'{colorama.Fore.CYAN}➡️   Executing "{" ".join(cmds)}"')
-    cmdResult = subprocess.run(cmds, check=check, env=envVars, stdout=subprocess.PIPE, encoding='utf-8')
+    cmdResult = subprocess.run(cmds, check=check, env={**environ, **envVars}, stdout=subprocess.PIPE, encoding='utf-8')
     if cmdResult.returncode == 0:
       return cmdResult.stdout
     else: