Merge pull request #40300 from gwynne/patch-1

Fix input environment not being respected by swift_build_support.shell.run()

Author: compnerd

utils/swift_build_support/swift_build_support/shell.py

@@ -211,7 +211,7 @@ def run(*args, **kwargs):
     repo_path = os.getcwd()
     echo_output = kwargs.pop('echo', False)
     dry_run = kwargs.pop('dry_run', False)
-    env = kwargs.pop('env', None)
+    env = kwargs.get('env', None)
     prefix = kwargs.pop('prefix', '')
     if dry_run:
         _echo_command(dry_run, *args, env=env, prompt="{0}+ ".format(prefix))

utils/update_checkout/update_checkout/update_checkout.py

@@ -285,7 +285,7 @@ def obtain_additional_swift_sources(pool_args):
      skip_history, skip_tags, skip_repository_list) = pool_args
 
     env = dict(os.environ)
-    env.update({'GIT_TERMINAL_PROMPT': 0})
+    env.update({'GIT_TERMINAL_PROMPT': '0'})
 
     with shell.pushd(args.source_root, dry_run=False, echo=False):