Skip to content

Fix Canary KeyError: 'ffmpeg_arguments' #35158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frenck merged 2 commits into from
May 4, 2020
Merged

Fix Canary KeyError: 'ffmpeg_arguments' #35158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df0c950
Fix Canary KeyError: 'ffmpeg_arguments'
frenck May 3, 2020
4f4f802
Small styling fix while we are here
frenck May 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions homeassistant/components/canary/alarm_control_panel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
def setup_platform(hass, config, add_entities, discovery_info=None):
"""Set up the Canary alarms."""
data = hass.data[DATA_CANARY]
devices = []

for location in data.locations:
devices.append(CanaryAlarm(data, location.location_id))
devices = [CanaryAlarm(data, location.location_id) for location in data.locations]

add_entities(devices, True)

Expand Down
3 changes: 3 additions & 0 deletions homeassistant/components/canary/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@

def setup_platform(hass, config, add_entities, discovery_info=None):
"""Set up the Canary sensors."""
if discovery_info is not None:
return

data = hass.data[DATA_CANARY]
devices = []

Expand Down