diff options
| author | Mario Melara <maamelara@gmail.com> | 2016-04-04 13:45:15 -0700 |
|---|---|---|
| committer | Mario Melara <maamelara@gmail.com> | 2016-04-04 13:45:15 -0700 |
| commit | 6d73c862096ecd6426d42dfe666c0908c2069a21 (patch) | |
| tree | 7b39df7147cb8282ad278809241708f375e36ef0 | |
| parent | 9c071ea40d6bacef2056184f7b256c2f1fb7cbd0 (diff) | |
| download | spack-6d73c862096ecd6426d42dfe666c0908c2069a21.tar.gz spack-6d73c862096ecd6426d42dfe666c0908c2069a21.tar.bz2 spack-6d73c862096ecd6426d42dfe666c0908c2069a21.tar.xz spack-6d73c862096ecd6426d42dfe666c0908c2069a21.zip | |
Gives error on cori that [PrgEnv-xx, gcc/x.x.x] is not part of the schema. Changed it to oneOf : type : array to get rid of the error.
| -rw-r--r-- | lib/spack/spack/config.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py index c9a770a53f..f978ed12b0 100644 --- a/lib/spack/spack/config.py +++ b/lib/spack/spack/config.py @@ -159,7 +159,9 @@ section_schemas = { 'type': 'object', 'additionalProperties': False, 'required': ['cc', 'cxx', 'f77', 'fc'], - 'properties': { + 'properties': { + 'strategy': { 'anyOf': [ {'type' : 'string' }, + {'type' : 'null' }]}, 'cc': { 'anyOf': [ {'type' : 'string' }, {'type' : 'null' }]}, 'cxx': { 'anyOf': [ {'type' : 'string' }, @@ -168,10 +170,10 @@ section_schemas = { {'type' : 'null' }]}, 'fc': { 'anyOf': [ {'type' : 'string' }, {'type' : 'null' }]}, - 'strategy': { 'anyOf': [ {'type' : 'string' }, - {'type' : 'null' }]}, - 'modules': { 'anyOf': [ {'type' : 'string' }, - {'type' : 'null' }]} + 'modules': { 'anyOf': [ {'type' : 'string'}, + {'type' : 'null' }, + {'type': 'array'}, + ]} },},},},},},},}, 'mirrors': { @@ -221,7 +223,7 @@ section_schemas = { 'items' : { 'anyOf' : [ { 'type' : 'string' }, { 'type' : 'number'}]}}, #version strings 'compiler': { - 'type' : 'array', + 'typee' : 'array', 'default' : [], 'items' : { 'type' : 'string' } }, #compiler specs 'nobuild': { |