diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-04-18 17:51:53 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-04-18 17:51:53 +0200 |
| commit | bce276d57301e97f7d09a902f4caa8a76735e22d (patch) | |
| tree | 12f23ba9f4d8bba3dde6c79a84194364632000a7 /lib | |
| parent | 50b148ca22b8bc9daeb1cb427eadeefd06e84800 (diff) | |
| download | spack-bce276d57301e97f7d09a902f4caa8a76735e22d.tar.gz spack-bce276d57301e97f7d09a902f4caa8a76735e22d.tar.bz2 spack-bce276d57301e97f7d09a902f4caa8a76735e22d.tar.xz spack-bce276d57301e97f7d09a902f4caa8a76735e22d.zip | |
fix : missing autoload, failing validation
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/config.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/modules.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py index 8e4cbba96e..1ac8a01619 100644 --- a/lib/spack/spack/config.py +++ b/lib/spack/spack/config.py @@ -293,7 +293,7 @@ section_schemas = { 'module_type_configuration': { 'type': 'object', 'default': {}, - 'oneOf': [ + 'anyOf': [ { 'properties': { 'whitelist': {'$ref': '#/definitions/array_of_strings'}, diff --git a/lib/spack/spack/modules.py b/lib/spack/spack/modules.py index 61ecdc10c3..5bf003f9ad 100644 --- a/lib/spack/spack/modules.py +++ b/lib/spack/spack/modules.py @@ -171,7 +171,7 @@ def parse_config_options(module_generator): env: list of custom environment modifications to be applied in the module file """ # Get the configuration for this kind of generator - module_configuration = copy.copy(CONFIGURATION.get(module_generator.name, {})) + module_configuration = copy.deepcopy(CONFIGURATION.get(module_generator.name, {})) ##### # Merge all the rules |