more thread safety

lib/spack/spack/environment/environment.py

@@ -21,6 +21,7 @@
 from llnl.util.lang import dedupe
 from llnl.util.symlink import symlink
 
+import spack.binary_distribution
 import spack.bootstrap
 import spack.compilers
 import spack.concretize
@@ -1282,6 +1283,10 @@ def _concretize_separately(self, tests=False):
         # processes try to write the config file in parallel
         _ = spack.compilers.get_compiler_config()
 
+        # Ensure that buildcache index is updated if reuse is on
+        if spack.config.get('config:reuse', False):
+            spack.binary_distribution.binary_index.update()
+
         # Early return if there is nothing to do
         if len(arguments) == 0:
             return []

lib/spack/spack/util/file_cache.py

@@ -174,6 +174,8 @@ def remove(self, key):
         try:
             lock.acquire_write()
             os.unlink(self.cache_path(key))
+        except FileNotFoundError:
+            pass  # for thread safety when locks=False
         finally:
             lock.release_write()
             lock.cleanup()