diff options
| author | Greg Becker <becker33@llnl.gov> | 2020-06-02 02:02:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-02 11:02:28 +0200 |
| commit | 2795414a80839208c3463e49f197fee25f2be0f8 (patch) | |
| tree | f06df81c12247a8717209b9fe2adf1241674831b /var | |
| parent | 0875c6a5d0ba8a951f86805814d4eb0ba3f3997e (diff) | |
| download | spack-2795414a80839208c3463e49f197fee25f2be0f8.tar.gz spack-2795414a80839208c3463e49f197fee25f2be0f8.tar.bz2 spack-2795414a80839208c3463e49f197fee25f2be0f8.tar.xz spack-2795414a80839208c3463e49f197fee25f2be0f8.zip | |
Fix satisfaction checks for excluding variants from matrices (#16893)
Because of the way abstract variants are implemented, the following
spec matrix does not work as intended:
```
matrix:
- [foo]
- [bar=a, bar=b]
exclude:
- bar=a
```
because abstract variants always satisfy any variant of the same
name, regardless of values.
This PR converts abstract variants to whatever their appropriate
type is before running satisfaction checks for the excludes clause
in a matrix.
fixes #16841
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin.mock/packages/multivalue-variant/package.py (renamed from var/spack/repos/builtin.mock/packages/multivalue_variant/package.py) | 0 | ||||
| -rw-r--r-- | var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/var/spack/repos/builtin.mock/packages/multivalue_variant/package.py b/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py index 22d0ea1d97..22d0ea1d97 100644 --- a/var/spack/repos/builtin.mock/packages/multivalue_variant/package.py +++ b/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py index 5507fbdc21..de14faa51f 100644 --- a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py @@ -14,4 +14,4 @@ class SinglevalueVariantDependent(Package): version('1.0', '0123456789abcdef0123456789abcdef') - depends_on('multivalue_variant fee=baz') + depends_on('multivalue-variant fee=baz') |