start _writer_daemon without by using the environment as it was before applying updates related to installing the package (running the _writer_daemon process requires the environment that was used to start Spack itself)

scheibelp · scheibelp · commit 6bbb7debfe69 · 2020-11-11T14:37:26.000-08:00
diff --git a/lib/spack/llnl/util/tty/log.py b/lib/spack/llnl/util/tty/log.py
@@ -372,6 +372,21 @@ def close_connection_and_file(multiprocess_fd, file):
         file.close()
 
 
+@contextmanager
+def replace_environment(env):
+    env = env or {}
+    old_env = os.environ.copy()
+    try:
+        os.environ.clear()
+        for name, val in env.items():
+            os.environ[name] = val
+        yield
+    finally:
+        os.environ.clear()
+        for name, val in old_env.items():
+            os.environ[name] = val
+
+
 class log_output(object):
     """Context manager that logs its output to a file.
 
@@ -408,7 +423,8 @@ class log_output(object):
     work within test frameworks like nose and pytest.
     """
 
-    def __init__(self, file_like=None, echo=False, debug=0, buffer=False):
+    def __init__(self, file_like=None, echo=False, debug=0, buffer=False,
+                 env=None):
         """Create a new output log context manager.
 
         Args:
@@ -436,6 +452,7 @@ def __init__(self, file_like=None, echo=False, debug=0, buffer=False):
         self.echo = echo
         self.debug = debug
         self.buffer = buffer
+        self.env = env  # the environment to use for _writer_daemon
 
         self._active = False  # used to prevent re-entry
 
@@ -509,15 +526,16 @@ def __enter__(self):
                 # just don't forward input if this fails
                 input_multiprocess_fd = None
 
-            self.process = multiprocessing.Process(
-                target=_writer_daemon,
-                args=(
-                    input_multiprocess_fd, read_multiprocess_fd, write_fd,
-                    self.echo, self.log_file, child_pipe
+            with replace_environment(self.env):
+                self.process = multiprocessing.Process(
+                    target=_writer_daemon,
+                    args=(
+                        input_multiprocess_fd, read_multiprocess_fd, write_fd,
+                        self.echo, self.log_file, child_pipe
+                    )
                 )
-            )
-            self.process.daemon = True  # must set before start()
-            self.process.start()
+                self.process.daemon = True  # must set before start()
+                self.process.start()
 
         finally:
             if input_multiprocess_fd:
diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py
@@ -820,6 +820,7 @@ def _setup_pkg_and_run(serialized_pkg, function, kwargs, child_pipe,
         pkg = serialized_pkg.restore()
 
         if not kwargs.get('fake', False):
+            kwargs['unmodified_env'] = os.environ.copy()
             setup_package(pkg, dirty=kwargs.get('dirty', False))
         return_value = function(pkg, kwargs)
         child_pipe.send(return_value)
diff --git a/lib/spack/spack/installer.py b/lib/spack/spack/installer.py
@@ -1569,6 +1569,7 @@ def build_process(pkg, kwargs):
     skip_patch = kwargs.get('skip_patch', False)
     verbose = kwargs.get('verbose', False)
     fake = kwargs.get('fake', False)
+    unmodified_env = kwargs.get('unmodified_env', {})
 
     start_time = time.time()
     if not fake:
@@ -1628,7 +1629,9 @@ def build_process(pkg, kwargs):
 
                 # Spawn a daemon that reads from a pipe and redirects
                 # everything to log_path
-                with log_output(pkg.log_path, echo, True) as logger:
+                with log_output(pkg.log_path, echo, True,
+                                env=unmodified_env) as logger:
+
                     for phase_name, phase_attr in zip(
                             pkg.phases, pkg._InstallPhase_phases):
 
