zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow completely empty config files.

Browse Source 
- Previous version would give validation error for an empty file.
  Now this is properly ignored.

- Also includes bugfix in ConfigFormatError
This commit is contained in:
Todd Gamblin 2016-01-17 19:55:20 -08:00
parent 8d6342c53d
commit ad32f64ef6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/spack/config.py
View File

@ -357,8 +357,8 @@ def _read_config_file(filename, schema):
with open(filename) as f: with open(filename) as f:
data = syaml.load(f) data = syaml.load(f)
validate_section(data, schema) if data:
validate_section(data, schema)
return data return data
except MarkedYAMLError, e: except MarkedYAMLError, e:
@ -514,7 +514,7 @@ def __init__(self, validation_error, data):
# Try really hard to get the parent (which sometimes is not # Try really hard to get the parent (which sometimes is not
# set) This digs it out of the validated structure if it's not # set) This digs it out of the validated structure if it's not
# on the validation_error. # on the validation_error.
if not parent_mark: if path and not parent_mark:
parent_path = list(path)[:-1] parent_path = list(path)[:-1]
parent = get_path(parent_path, data) parent = get_path(parent_path, data)
if path[-1] in parent: if path[-1] in parent: