diff options
| author | Gregory Becker <becker33@llnl.gov> | 2019-05-08 12:23:17 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2019-07-18 19:28:50 -0700 |
| commit | 88295d927ed4462500c820bf2661c76b33a87b3d (patch) | |
| tree | 0797d7b99ef2d86ee1b4f77fd80cc83ea2db9048 /lib | |
| parent | 9577ade3cea4afc6d99af3a54010ddf63101a375 (diff) | |
| download | spack-88295d927ed4462500c820bf2661c76b33a87b3d.tar.gz spack-88295d927ed4462500c820bf2661c76b33a87b3d.tar.bz2 spack-88295d927ed4462500c820bf2661c76b33a87b3d.tar.xz spack-88295d927ed4462500c820bf2661c76b33a87b3d.zip | |
bugfix: spec lists can now include multiple references
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/spec_list.py | 3 | ||||
| -rw-r--r-- | lib/spack/spack/test/spec_list.py | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/spack/spack/spec_list.py b/lib/spack/spack/spec_list.py index 43bbd500d8..460e7846ed 100644 --- a/lib/spack/spack/spec_list.py +++ b/lib/spack/spack/spec_list.py @@ -131,8 +131,7 @@ class SpecList(object): if name in self._reference: ret = [self._expand_references(i) for i in yaml[:idx]] ret += self._reference[name].specs_as_yaml_list - ret += [self._expand_references(i) - for i in yaml[idx + 1:]] + ret += self._expand_references(yaml[idx + 1:]) return ret else: msg = 'SpecList %s refers to ' % self.name diff --git a/lib/spack/spack/test/spec_list.py b/lib/spack/spack/test/spec_list.py index 9dbfc80a28..f40c389952 100644 --- a/lib/spack/spack/test/spec_list.py +++ b/lib/spack/spack/test/spec_list.py @@ -8,10 +8,11 @@ from spack.spec import Spec class TestSpecList(object): default_input = ['mpileaks', '$mpis', - {'matrix': [['hypre'], ['$gccs', '%clang@3.3']]}, + {'matrix': [['hypre'], ['$gccs', '$clangs']]}, 'libelf'] default_reference = {'gccs': SpecList('gccs', ['%gcc@4.5.0']), + 'clangs': SpecList('clangs', ['%clang@3.3']), 'mpis': SpecList('mpis', ['zmpi@1.0', 'mpich@3.0'])} default_expansion = ['mpileaks', 'zmpi@1.0', 'mpich@3.0', |