summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2019-11-05 02:37:49 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2019-11-05 02:47:27 -0700
commitecfe84def70c8ccba32c2c3d7d3a25296e10dc59 (patch)
treefd062db34daf731a6385ba8ba1714e03c1e20365
parentfbb5cf944bc9aadc7a37b8508f5c168656681a2b (diff)
downloadspack-ecfe84def70c8ccba32c2c3d7d3a25296e10dc59.tar.gz
spack-ecfe84def70c8ccba32c2c3d7d3a25296e10dc59.tar.bz2
spack-ecfe84def70c8ccba32c2c3d7d3a25296e10dc59.tar.xz
spack-ecfe84def70c8ccba32c2c3d7d3a25296e10dc59.zip
bugfix: uninstall should find concrete specs by DAG hash
This fixes a regression introduced in #10792. `spack uninstall` in an environment would not match concrete query specs properly after the index hash of enviroments changed. - [x] Search by DAG hash for specs to remove instead of by build hash
-rw-r--r--lib/spack/spack/environment.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/spack/spack/environment.py b/lib/spack/spack/environment.py
index 4ab01cb250..f16599c215 100644
--- a/lib/spack/spack/environment.py
+++ b/lib/spack/spack/environment.py
@@ -833,8 +833,16 @@ class Environment(object):
if not matches:
# concrete specs match against concrete specs in the env
+ # by *dag hash*, not build hash.
+ dag_hashes_in_order = [
+ self.specs_by_hash[build_hash].dag_hash()
+ for build_hash in self.concretized_order
+ ]
+
specs_hashes = zip(
- self.concretized_user_specs, self.concretized_order)
+ self.concretized_user_specs, dag_hashes_in_order
+ )
+
matches = [
s for s, h in specs_hashes
if query_spec.dag_hash() == h