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

allow external packages that violate conflicts (#18183)

Browse Source
This commit is contained in:
Greg Becker 2020-08-20 10:16:48 -07:00 committed by GitHub
parent 573ce3fe81
commit ad9cd25285
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/spec.py
View File

@ -2330,6 +2330,10 @@ def concretize(self, tests=False):
# TODO: internal configuration conflicts within one package. # TODO: internal configuration conflicts within one package.
matches = [] matches = []
for x in self.traverse(): for x in self.traverse():
if x.external:
# external specs are already built, don't worry about whether
# it's possible to build that configuration with Spack
continue
for conflict_spec, when_list in x.package_class.conflicts.items(): for conflict_spec, when_list in x.package_class.conflicts.items():
if x.satisfies(conflict_spec, strict=True): if x.satisfies(conflict_spec, strict=True):
for when_spec, msg in when_list: for when_spec, msg in when_list:

6
lib/spack/spack/test/concretize.py
View File

@ -500,6 +500,12 @@ def test_conflicts_in_spec(self, conflict_spec):
with pytest.raises(exc_type): with pytest.raises(exc_type):
s.concretize() s.concretize()
def test_no_conflixt_in_external_specs(self, conflict_spec):
# clear deps because external specs cannot depend on anything
ext = Spec(conflict_spec).copy(deps=False)
ext.external_path = '/fake/path'
ext.concretize() # failure raises exception
def test_regression_issue_4492(self): def test_regression_issue_4492(self):
# Constructing a spec which has no dependencies, but is otherwise # Constructing a spec which has no dependencies, but is otherwise
# concrete is kind of difficult. What we will do is to concretize # concrete is kind of difficult. What we will do is to concretize