zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More flexible reading of specs from DB, formatting.

Browse Source
This commit is contained in:
Todd Gamblin 2016-05-30 22:02:22 -07:00
parent f3f0122f11
commit 24ee32d7b0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/spack/spack/database.py
View File

@ -214,9 +214,10 @@ def _read_spec_from_yaml(self, hash_key, installs, parent_key=None):
# Add dependencies from other records in the install DB to # Add dependencies from other records in the install DB to
# form a full spec. # form a full spec.
for dep_hash in spec_dict[spec.name]['dependencies'].values(): if 'dependencies' in spec_dict[spec.name]:
child = self._read_spec_from_yaml(dep_hash, installs, hash_key) for dep_hash in spec_dict[spec.name]['dependencies'].values():
spec._add_dependency(child) child = self._read_spec_from_yaml(dep_hash, installs, hash_key)
spec._add_dependency(child)
# Specs from the database need to be marked concrete because # Specs from the database need to be marked concrete because
# they represent actual installations. # they represent actual installations.
@ -289,7 +290,8 @@ def check(cond, msg):
except Exception as e: except Exception as e:
tty.warn("Invalid database reecord:", tty.warn("Invalid database reecord:",
"file: %s" % self._index_path, "file: %s" % self._index_path,
"hash: %s" % hash_key, "cause: %s" % str(e)) "hash: %s" % hash_key,
"cause: %s: %s" % (type(e).__name__, str(e)))
raise raise
self._data = data self._data = data