Reconstruct virtuals when reading from Cray manifest

alalazo · alalazo · commit 9c31dea6ea91 · 2023-06-14T10:10:06.000+02:00
diff --git a/lib/spack/spack/cray_manifest.py b/lib/spack/spack/cray_manifest.py
@@ -164,9 +164,11 @@ def entries_to_specs(entries):
                     continue
                 parent_spec = spec_dict[entry["hash"]]
                 dep_spec = spec_dict[dep_hash]
-                # TODO: Check this with Peter
                 parent_spec._add_dependency(dep_spec, deptypes=deptypes, virtuals=())
 
+    for spec in spec_dict.values():
+        spack.spec.reconstruct_virtuals_on_edges(spec)
+
     return spec_dict
 
 
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
@@ -4804,9 +4804,11 @@ def merge_abstract_anonymous_specs(*abstract_specs: Spec):
     return merged_spec
 
 
-def _reconstruct_virtuals_on_edges(spec):
-    """Reconstruct virtuals on edges. Used to read from old DB
-    and reindex.
+def reconstruct_virtuals_on_edges(spec):
+    """Reconstruct virtuals on edges. Used to read from old DB and reindex.
+
+    Args:
+        spec: spec on which we want to reconstruct virtuals
     """
     # Collect all possible virtuals
     possible_virtuals = set()
@@ -4983,7 +4985,7 @@ def load(cls, data):
             for dname, _, dtypes, _, virtuals in cls.dependencies_from_node_dict(data):
                 deps[name]._add_dependency(deps[dname], deptypes=dtypes, virtuals=virtuals)
 
-        _reconstruct_virtuals_on_edges(result)
+        reconstruct_virtuals_on_edges(result)
         return result
 
     @classmethod
@@ -5025,7 +5027,7 @@ class SpecfileV2(SpecfileReaderBase):
     @classmethod
     def load(cls, data):
         result = cls._load(data)
-        _reconstruct_virtuals_on_edges(result)
+        reconstruct_virtuals_on_edges(result)
         return result
 
     @classmethod
