jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-28 11:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2032 from home-assistant/dev

Browse Source 
Release 242
This commit is contained in:
Pascal Vizeli 2020-09-08 14:07:19 +02:00 committed by GitHub
commit 598108d294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -2,7 +2,8 @@ ARG BUILD_FROM
FROM $BUILD_FROM FROM $BUILD_FROM
ENV \ ENV \
S6_SERVICES_GRACETIME=10000 S6_SERVICES_GRACETIME=10000 \
SUPERVISOR_API=http://localhost
# Install base # Install base
RUN \ RUN \

2
supervisor/const.py
View File

@ -3,7 +3,7 @@ from enum import Enum
from ipaddress import ip_network from ipaddress import ip_network
from pathlib import Path from pathlib import Path
SUPERVISOR_VERSION = "241" SUPERVISOR_VERSION = "242"
URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons" URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons"
URL_HASSIO_APPARMOR = "https://version.home-assistant.io/apparmor.txt" URL_HASSIO_APPARMOR = "https://version.home-assistant.io/apparmor.txt"

4
supervisor/snapshots/__init__.py
View File

@ -258,7 +258,7 @@ class SnapshotManager(CoreSysAttributes):
# finish homeassistant task # finish homeassistant task
_LOGGER.info("Restore %s wait until homeassistant ready", snapshot.slug) _LOGGER.info("Restore %s wait until homeassistant ready", snapshot.slug)
await task_hass await task_hass
await self.sys_homeassistant.start() await self.sys_homeassistant.core.start()
except Exception: # pylint: disable=broad-except except Exception: # pylint: disable=broad-except
_LOGGER.exception("Restore %s error", snapshot.slug) _LOGGER.exception("Restore %s error", snapshot.slug)
@ -327,7 +327,7 @@ class SnapshotManager(CoreSysAttributes):
# Do we need start HomeAssistant? # Do we need start HomeAssistant?
if not await self.sys_homeassistant.core.is_running(): if not await self.sys_homeassistant.core.is_running():
await self.sys_homeassistant.start() await self.sys_homeassistant.core.start()
# Check If we can access to API / otherwise restart # Check If we can access to API / otherwise restart
if not await self.sys_homeassistant.api.check_api_state(): if not await self.sys_homeassistant.api.check_api_state():