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

Additional circular reference checking

Browse Source
This commit is contained in:
Todd Gamblin 2013-12-08 21:38:37 -08:00
parent e0c029c347
commit fa2e8dab11
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/spack/spack/relations.py
View File

@ -127,7 +127,7 @@ def depends_on(*specs):
for string in specs: for string in specs:
for spec in spack.spec.parse(string): for spec in spack.spec.parse(string):
if pkg == spec.name: if pkg == spec.name:
raise CircularDependencyError('depends_on', pkg) raise CircularReferenceError('depends_on', pkg)
dependencies[spec.name] = spec dependencies[spec.name] = spec
@ -143,6 +143,8 @@ def provides(*specs, **kwargs):
provided = _caller_locals().setdefault("provided", {}) provided = _caller_locals().setdefault("provided", {})
for string in specs: for string in specs:
for provided_spec in spack.spec.parse(string): for provided_spec in spack.spec.parse(string):
if pkg == provided_spec.name:
raise CircularReferenceError('depends_on', pkg)
provided[provided_spec] = provider_spec provided[provided_spec] = provider_spec
@ -171,8 +173,10 @@ def __init__(self, relation):
"Cannot inovke '%s' from outside of a Spack package!" % relation) "Cannot inovke '%s' from outside of a Spack package!" % relation)
class CircularDependencyError(RelationError): class CircularReferenceError(RelationError):
"""This is raised when something depends on itself.""" """This is raised when something depends on itself."""
def __init__(self, relation, package): def __init__(self, relation, package):
super(CircularDependencyError, self).__init__( super(CircularReferenceError, self).__init__(
relation, "Package %s cannot depend on itself." % package) relation,
"Package '%s' cannot pass itself to %s." % (package, relation))
self.package = package