From 6d73c862096ecd6426d42dfe666c0908c2069a21 Mon Sep 17 00:00:00 2001
From: Mario Melara <maamelara@gmail.com>
Date: Mon, 4 Apr 2016 13:45:15 -0700
Subject: 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.
---
lib/spack/spack/config.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
(limited to 'lib')
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': {
--
cgit v1.2.3-70-g09d2