Merge branch 'master' into feature-backup-manager

* master:
  Still raise exception when loading incorrect material file
This commit is contained in:
ChrisTerBeke 2018-05-16 19:22:19 +02:00
commit cb11608f98
No known key found for this signature in database
GPG Key ID: A49F1AB9D7E0C263

View File

@ -540,8 +540,7 @@ class XmlMaterialProfile(InstanceContainer):
validation_message = XmlMaterialValidator.validateMaterialMetaData(meta_data)
if validation_message is not None:
return
# raise Exception("Not valid material profile: %s" % (validation_message))
raise Exception("Not valid material profile: %s" % (validation_message))
property_values = {}
properties = data.iterfind("./um:properties/*", self.__namespaces)