jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix script merge conflict

Browse Source
This commit is contained in:
Paulus Schoutsen 2016-04-28 13:39:44 +02:00
parent 31e019e88a
commit 1d28fa712f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/helpers/script.py
View File

@ -119,7 +119,7 @@ class Script():
"""Test if condition is matching.""" """Test if condition is matching."""
self.last_action = action.get(CONF_ALIAS, action[CONF_CONDITION]) self.last_action = action.get(CONF_ALIAS, action[CONF_CONDITION])
check = condition.from_config(action)(self.hass, False) check = condition.from_config(action)(self.hass, False)
self._log("Test condition %s: %s", self.last_action, check) self._log("Test condition {}: {}".format(self.last_action, check))
return check return check
def _remove_listener(self): def _remove_listener(self):