conditional deps: bugfix for type mismatch in _add_dependency
Signed-off-by: Gregory Becker <becker33@llnl.gov>
This commit is contained in:
parent
ce3fcf011f
commit
d792121cde
@ -1780,6 +1780,9 @@ def _add_dependency(
|
|||||||
direct: if True denotes a direct dependency (associated with the % sigil)
|
direct: if True denotes a direct dependency (associated with the % sigil)
|
||||||
when: if non-None, condition under which dependency holds
|
when: if non-None, condition under which dependency holds
|
||||||
"""
|
"""
|
||||||
|
if when is None:
|
||||||
|
when = Spec()
|
||||||
|
|
||||||
if spec.name not in self._dependencies or not spec.name:
|
if spec.name not in self._dependencies or not spec.name:
|
||||||
self.add_dependency_edge(
|
self.add_dependency_edge(
|
||||||
spec, depflag=depflag, virtuals=virtuals, direct=direct, when=when
|
spec, depflag=depflag, virtuals=virtuals, direct=direct, when=when
|
||||||
@ -1839,6 +1842,9 @@ def add_dependency_edge(
|
|||||||
direct: if True denotes a direct dependency
|
direct: if True denotes a direct dependency
|
||||||
when: if non-None, condition under which dependency holds
|
when: if non-None, condition under which dependency holds
|
||||||
"""
|
"""
|
||||||
|
if when is None:
|
||||||
|
when = Spec()
|
||||||
|
|
||||||
# Check if we need to update edges that are already present
|
# Check if we need to update edges that are already present
|
||||||
selected = self._dependencies.select(child=dependency_spec.name)
|
selected = self._dependencies.select(child=dependency_spec.name)
|
||||||
for edge in selected:
|
for edge in selected:
|
||||||
|
Loading…
Reference in New Issue
Block a user