Allow completely empty config files.

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

- Also includes bugfix in ConfigFormatError

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py
index 193b311434..6fecde9980 100644
--- a/lib/spack/spack/config.py
+++ b/lib/spack/spack/config.py
@@ -357,8 +357,8 @@ def _read_config_file(filename, schema):
         with open(filename) as f:
             data = syaml.load(f)
 
-        validate_section(data, schema)
-
+        if data:
+            validate_section(data, schema)
         return data
 
     except MarkedYAMLError, e:
@@ -514,7 +514,7 @@ class ConfigFormatError(ConfigError):
         # Try really hard to get the parent (which sometimes is not
         # set) This digs it out of the validated structure if it's not
         # on the validation_error.
-        if not parent_mark:
+        if path and not parent_mark:
             parent_path = list(path)[:-1]
             parent = get_path(parent_path, data)
             if path[-1] in parent: