fix --reuse w/ upstreams in env (#29680)

This commit is contained in:
Harmen Stoppels 2022-03-24 14:25:00 +01:00 committed by GitHub
parent 59e522e815
commit 1a728c98ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -146,10 +146,12 @@ def activate(env, use_env_repo=False):
# Check if we need to reinitialize the store due to pushing the configuration
# below.
store_before_pushing = spack.config.get('config:install_tree')
install_tree_before = spack.config.get('config:install_tree')
upstreams_before = spack.config.get('upstreams')
prepare_config_scope(env)
store_after_pushing = spack.config.get('config:install_tree')
if store_before_pushing != store_after_pushing:
install_tree_after = spack.config.get('config:install_tree')
upstreams_after = spack.config.get('upstreams')
if install_tree_before != install_tree_after or upstreams_before != upstreams_after:
# Hack to store the state of the store before activation
env.store_token = spack.store.reinitialize()