evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct trace of condition actions (#50800)

Browse source
This commit is contained in:
Erik Montnemery 2021-05-18 01:54:17 +02:00 • committed by GitHub
parent 781524ee36
commit 1ea0d8ae02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
homeassistant/helpers/script.py
View file

@ -87,6 +87,8 @@ from .trace import (
trace_stack_cv,
trace_stack_pop,
trace_stack_push,
trace_stack_top,
trace_update_result,
)
# mypy: allow-untyped-calls, allow-untyped-defs, no-check-untyped-defs
@ -619,14 +621,16 @@ class _ScriptRun:
)
cond = await self._async_get_condition(self._action)
try:
with trace_path("condition"):
check = cond(self._hass, self._variables)
trace_element = trace_stack_top(trace_stack_cv)
if trace_element:
trace_element.reuse_by_child = True
check = cond(self._hass, self._variables)
except exceptions.ConditionError as ex:
_LOGGER.warning("Error in 'condition' evaluation:\n%s", ex)
check = False
self._log("Test condition %s: %s", self._script.last_action, check)
trace_set_result(result=check)
trace_update_result(result=check)
if not check:
raise _StopScript