address review comments

scheibelp · scheibelp · commit a9a9466a05a3 · 2019-07-12T13:12:18.000-07:00
diff --git a/lib/spack/spack/environment.py b/lib/spack/spack/environment.py
@@ -426,8 +426,10 @@ def __init__(self, path, init_file=None, with_view=None):
                     self._set_user_specs_from_lockfile()
 
                 if read_lock_version == 1:
+                    tty.debug(
+                        "Storing backup of old lockfile {0} at {1}".format(
+                            self.lock_path, self._lock_backup_v1_path))
                     shutil.copy(self.lock_path, self._lock_backup_v1_path)
-                    tty.debug("Storing backup of old lockfile format")
 
         if with_view is False:
             self._view_path = None
@@ -1002,22 +1004,19 @@ def _read_lockfile_dict(self, d):
         old_hash_to_new = {}
         self.specs_by_hash = {}
         for _, spec in specs_by_hash.items():
-            old_hash = spec.dag_hash()
-            full_hash = spec.dag_hash(all_deps=True)
-            if old_hash in root_hashes:
-                old_hash_to_new[old_hash] = full_hash
+            dag_hash = spec.dag_hash()
+            build_hash = spec.dag_hash(all_deps=True)
+            if dag_hash in root_hashes:
+                old_hash_to_new[dag_hash] = build_hash
 
-            if (old_hash in root_hashes or full_hash in root_hashes):
-                self.specs_by_hash[full_hash] = spec
+            if (dag_hash in root_hashes or build_hash in root_hashes):
+                self.specs_by_hash[build_hash] = spec
 
         if old_hash_to_new:
-            updated_hashes_order = list()
-            for h in self.concretized_order:
-                if h in old_hash_to_new:
-                    updated_hashes_order.append(old_hash_to_new[h])
-                else:
-                    updated_hashes_order.append(h)
-            self.concretized_order = updated_hashes_order
+            # Replace any older hashes in concretized_order with hashes
+            # that include build deps
+            self.concretized_order = [
+                old_hash_to_new.get(h, h) for h in self.concretized_order]
 
     def write(self):
         """Writes an in-memory environment to its location on disk.
