Merge pull request #4 from mklauser/pr136

Pr136
mklauser · May 7, 2014 · d737b59 · d737b59
2 parents 632e37f + 2360bc5
commit d737b59
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/tardis/data/tardis_config_definition.yml b/tardis/data/tardis_config_definition.yml
@@ -134,7 +134,7 @@ model:
         filetype:
             property_type: string
             default: None
-            allowed_value: ['simple_ascii', 'bla']
+            allowed_value: ['simple_ascii', 'artis']
             mandatory: True
             help: file type
 

diff --git a/tardis/io/config_validator.py b/tardis/io/config_validator.py
@@ -993,10 +993,17 @@ def __init__(self, container_default_dict, container_dict, container_path=None):
                 if self.__has_additional_items:
                     for aitem in additional_items:
                         try:
-                            self.__default_container[aitem], self.__config_container[aitem] = \
-                                self.parse_container_items(container_default_dict[aitem],
-                                                           container_dict[aitem], aitem,
+                            if aitem in container_dict:
+                                self.__default_container[aitem], self.__config_container[aitem] = \
+                                    self.parse_container_items(container_default_dict[aitem],
+                                                               container_dict[aitem], aitem,
                                                            self.__container_path + [aitem])
+                            else:
+                                self.__default_container[aitem], self.__config_container[aitem] = \
+                                    self.parse_container_items(container_default_dict[aitem],
+                                                               None, aitem,
+                                                               self.__container_path + [aitem])
+
                         except KeyError:
                             pass