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

Fix update order (#1666)

Browse Source
This commit is contained in:
Pascal Vizeli 2020-04-21 14:41:44 +02:00 committed by GitHub
parent 168ea32d2c
commit 175848f2a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
supervisor/core.py
View File

@ -34,6 +34,9 @@ class Core(CoreSysAttributes):
"""Setup supervisor orchestration.""" """Setup supervisor orchestration."""
self.state = CoreStates.STARTUP self.state = CoreStates.STARTUP
# load last available data
await self.sys_updater.load()
# Load DBus # Load DBus
await self.sys_dbus.load() await self.sys_dbus.load()
@ -61,9 +64,6 @@ class Core(CoreSysAttributes):
# rest api views # rest api views
await self.sys_api.load() await self.sys_api.load()
# load last available data
await self.sys_updater.load()
# load last available data # load last available data
await self.sys_snapshots.load() await self.sys_snapshots.load()

2
supervisor/docker/interface.py
View File

@ -444,7 +444,7 @@ class DockerInterface(CoreSysAttributes):
_LOGGER.debug("No version found for %s", self.image) _LOGGER.debug("No version found for %s", self.image)
raise DockerAPIError() raise DockerAPIError()
else: else:
_LOGGER.debug("Found HA versions: %s", available_version) _LOGGER.debug("Found %s versions: %s", self.image, available_version)
# Sort version and return latest version # Sort version and return latest version
available_version.sort(key=key, reverse=True) available_version.sort(key=key, reverse=True)

48
supervisor/updater.py
View File

@ -87,55 +87,49 @@ class Updater(JsonConfig, CoreSysAttributes):
@property @property
def image_homeassistant(self) -> Optional[str]: def image_homeassistant(self) -> Optional[str]:
"""Return latest version of Home Assistant.""" """Return latest version of Home Assistant."""
return ( if ATTR_HOMEASSISTANT not in self._data[ATTR_IMAGE]:
self._data[ATTR_IMAGE] return None
.get(ATTR_HOMEASSISTANT, "") return self._data[ATTR_IMAGE][ATTR_HOMEASSISTANT].format(
.format(machine=self.sys_machine) machine=self.sys_machine
) )
@property @property
def image_supervisor(self) -> Optional[str]: def image_supervisor(self) -> Optional[str]:
"""Return latest version of Supervisor.""" """Return latest version of Supervisor."""
return ( if ATTR_SUPERVISOR not in self._data[ATTR_IMAGE]:
self._data[ATTR_IMAGE] return None
.get(ATTR_SUPERVISOR, "") return self._data[ATTR_IMAGE][ATTR_SUPERVISOR].format(
.format(arch=self.sys_arch.supervisor) arch=self.sys_arch.supervisor
) )
@property @property
def image_cli(self) -> Optional[str]: def image_cli(self) -> Optional[str]:
"""Return latest version of CLI.""" """Return latest version of CLI."""
return ( if ATTR_CLI not in self._data[ATTR_IMAGE]:
self._data[ATTR_IMAGE] return None
.get(ATTR_CLI, "") return self._data[ATTR_IMAGE][ATTR_CLI].format(arch=self.sys_arch.supervisor)
.format(arch=self.sys_arch.supervisor)
)
@property @property
def image_dns(self) -> Optional[str]: def image_dns(self) -> Optional[str]:
"""Return latest version of DNS.""" """Return latest version of DNS."""
return ( if ATTR_DNS not in self._data[ATTR_IMAGE]:
self._data[ATTR_IMAGE] return None
.get(ATTR_DNS, "") return self._data[ATTR_IMAGE][ATTR_DNS].format(arch=self.sys_arch.supervisor)
.format(arch=self.sys_arch.supervisor)
)
@property @property
def image_audio(self) -> Optional[str]: def image_audio(self) -> Optional[str]:
"""Return latest version of Audio.""" """Return latest version of Audio."""
return ( if ATTR_AUDIO not in self._data[ATTR_IMAGE]:
self._data[ATTR_IMAGE] return None
.get(ATTR_AUDIO, "") return self._data[ATTR_IMAGE][ATTR_AUDIO].format(arch=self.sys_arch.supervisor)
.format(arch=self.sys_arch.supervisor)
)
@property @property
def image_multicast(self) -> Optional[str]: def image_multicast(self) -> Optional[str]:
"""Return latest version of Multicast.""" """Return latest version of Multicast."""
return ( if ATTR_MULTICAST not in self._data[ATTR_IMAGE]:
self._data[ATTR_IMAGE] return None
.get(ATTR_MULTICAST, "") return self._data[ATTR_IMAGE][ATTR_MULTICAST].format(
.format(arch=self.sys_arch.supervisor) arch=self.sys_arch.supervisor
) )
@property @property