Fix #1
This commit is contained in:
parent
a56d78e096
commit
10f967ce16
@ -31,7 +31,7 @@ def load_yaml(fname, args={}):
|
|||||||
except loader.yaml.YAMLError as exc:
|
except loader.yaml.YAMLError as exc:
|
||||||
_LOGGER.error(str(exc))
|
_LOGGER.error(str(exc))
|
||||||
raise HomeAssistantError(exc)
|
raise HomeAssistantError(exc)
|
||||||
except (UnicodeDecodeError, FileNotFoundError) as exc:
|
except UnicodeDecodeError as exc:
|
||||||
_LOGGER.error("Unable to read file %s: %s", fname, exc)
|
_LOGGER.error("Unable to read file %s: %s", fname, exc)
|
||||||
raise HomeAssistantError(exc)
|
raise HomeAssistantError(exc)
|
||||||
|
|
||||||
@ -43,7 +43,11 @@ def _include_yaml(ldr, node):
|
|||||||
else:
|
else:
|
||||||
fn, args, *_ = ldr.construct_sequence(node)
|
fn, args, *_ = ldr.construct_sequence(node)
|
||||||
fname = os.path.join(os.path.dirname(ldr.name), fn)
|
fname = os.path.join(os.path.dirname(ldr.name), fn)
|
||||||
|
try:
|
||||||
return loader._add_reference(load_yaml(fname, args), ldr, node)
|
return loader._add_reference(load_yaml(fname, args), ldr, node)
|
||||||
|
except FileNotFoundError as exc:
|
||||||
|
_LOGGER.error("Unable to include file %s: %s", fname, exc);
|
||||||
|
raise HomeAssistantError(exc)
|
||||||
|
|
||||||
def _uncache_file(ldr, node):
|
def _uncache_file(ldr, node):
|
||||||
path = node.value
|
path = node.value
|
||||||
|
Loading…
x
Reference in New Issue
Block a user