From e40f2ed8e3b13389f398ece45c5473110eb2483e Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 15 Aug 2019 11:36:47 +0200 Subject: [PATCH 1/6] Bump version 176 --- hassio/const.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hassio/const.py b/hassio/const.py index 55954018c..e15b3893f 100644 --- a/hassio/const.py +++ b/hassio/const.py @@ -3,7 +3,7 @@ from pathlib import Path from ipaddress import ip_network -HASSIO_VERSION = "175" +HASSIO_VERSION = "176" URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons" URL_HASSIO_VERSION = "https://version.home-assistant.io/{channel}.json" From 930a32de1a6832eda5997f4ac72cc6a91e2a5edc Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 15 Aug 2019 12:42:21 +0200 Subject: [PATCH 2/6] Fix latest issue (#1214) * Fix latest issue * Use also update now * Fix style --- hassio/docker/interface.py | 4 ++-- hassio/supervisor.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hassio/docker/interface.py b/hassio/docker/interface.py index d55355c22..02f8c6485 100644 --- a/hassio/docker/interface.py +++ b/hassio/docker/interface.py @@ -250,7 +250,7 @@ class DockerInterface(CoreSysAttributes): self, tag: str, image: Optional[str] = None, latest: bool = False ) -> Awaitable[None]: """Update a Docker image.""" - return self.sys_run_in_executor(self._update, tag, image) + return self.sys_run_in_executor(self._update, tag, image, latest) def _update( self, tag: str, image: Optional[str] = None, latest: bool = False @@ -266,7 +266,7 @@ class DockerInterface(CoreSysAttributes): ) # Update docker image - self._install(tag, image, latest) + self._install(tag, image=image, latest=latest) # Stop container & cleanup with suppress(DockerAPIError): diff --git a/hassio/supervisor.py b/hassio/supervisor.py index 644dc30f8..c18c92d0b 100644 --- a/hassio/supervisor.py +++ b/hassio/supervisor.py @@ -109,7 +109,7 @@ class Supervisor(CoreSysAttributes): _LOGGER.info("Update Supervisor to version %s", version) try: - await self.instance.install(version, latest=True) + await self.instance.update(version, latest=True) except DockerAPIError: _LOGGER.error("Update of Hass.io fails!") raise SupervisorUpdateError() from None From dc31b6e6fee02b481c780bc58919fd520a9609ca Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 15 Aug 2019 13:57:44 +0200 Subject: [PATCH 3/6] Call update of resolv later (#1215) --- hassio/dns.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hassio/dns.py b/hassio/dns.py index 949e07bfc..a46ef3078 100644 --- a/hassio/dns.py +++ b/hassio/dns.py @@ -106,8 +106,8 @@ class CoreDNS(JsonConfig, CoreSysAttributes): # Start DNS forwarder self.sys_create_task(self.forwarder.start(self.sys_docker.network.dns)) - with suppress(CoreDNSError): - self._update_local_resolv() + # Can't execute after start + self.sys_loop.call_later(60, self._update_local_resolv) # Start is not Running if await self.instance.is_running(): @@ -324,7 +324,7 @@ class CoreDNS(JsonConfig, CoreSysAttributes): for line in resolv.readlines(): resolv_lines.append(line) except OSError as err: - _LOGGER.error("Can't read local resolve: %s", err) + _LOGGER.error("Can't read local resolv: %s", err) raise CoreDNSError() from None if nameserver in resolv_lines: @@ -338,5 +338,5 @@ class CoreDNS(JsonConfig, CoreSysAttributes): for line in resolv_lines: resolv.write(line) except OSError as err: - _LOGGER.error("Can't write local resolve: %s", err) + _LOGGER.error("Can't write local resolv: %s", err) raise CoreDNSError() from None From d89cb91c8c3850be64fe521cd2386bcb2c5ed34a Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 15 Aug 2019 14:42:05 +0200 Subject: [PATCH 4/6] Revert "Call update of resolv later (#1215)" (#1217) This reverts commit dc31b6e6fee02b481c780bc58919fd520a9609ca. --- hassio/dns.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hassio/dns.py b/hassio/dns.py index a46ef3078..949e07bfc 100644 --- a/hassio/dns.py +++ b/hassio/dns.py @@ -106,8 +106,8 @@ class CoreDNS(JsonConfig, CoreSysAttributes): # Start DNS forwarder self.sys_create_task(self.forwarder.start(self.sys_docker.network.dns)) - # Can't execute after start - self.sys_loop.call_later(60, self._update_local_resolv) + with suppress(CoreDNSError): + self._update_local_resolv() # Start is not Running if await self.instance.is_running(): @@ -324,7 +324,7 @@ class CoreDNS(JsonConfig, CoreSysAttributes): for line in resolv.readlines(): resolv_lines.append(line) except OSError as err: - _LOGGER.error("Can't read local resolv: %s", err) + _LOGGER.error("Can't read local resolve: %s", err) raise CoreDNSError() from None if nameserver in resolv_lines: @@ -338,5 +338,5 @@ class CoreDNS(JsonConfig, CoreSysAttributes): for line in resolv_lines: resolv.write(line) except OSError as err: - _LOGGER.error("Can't write local resolv: %s", err) + _LOGGER.error("Can't write local resolve: %s", err) raise CoreDNSError() from None From 81e511ba8e5315349c6bf0da7be5b2be9a4b574a Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 15 Aug 2019 12:42:34 +0000 Subject: [PATCH 5/6] Fix spell --- hassio/dns.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hassio/dns.py b/hassio/dns.py index 949e07bfc..2a4cad846 100644 --- a/hassio/dns.py +++ b/hassio/dns.py @@ -324,7 +324,7 @@ class CoreDNS(JsonConfig, CoreSysAttributes): for line in resolv.readlines(): resolv_lines.append(line) except OSError as err: - _LOGGER.error("Can't read local resolve: %s", err) + _LOGGER.error("Can't read local resolv: %s", err) raise CoreDNSError() from None if nameserver in resolv_lines: @@ -338,5 +338,5 @@ class CoreDNS(JsonConfig, CoreSysAttributes): for line in resolv_lines: resolv.write(line) except OSError as err: - _LOGGER.error("Can't write local resolve: %s", err) + _LOGGER.error("Can't write local resolv: %s", err) raise CoreDNSError() from None From ae0a1a657f811a98f570ee24f978b079758c205b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2019 14:46:16 +0200 Subject: [PATCH 6/6] Bump gitpython from 3.0.0 to 3.0.1 (#1216) Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/gitpython-developers/GitPython/releases) - [Changelog](https://github.com/gitpython-developers/GitPython/blob/master/CHANGES) - [Commits](https://github.com/gitpython-developers/GitPython/compare/3.0.0...3.0.1) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 56f1ba865..553c8b8b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ colorlog==4.0.2 cpe==1.2.1 cryptography==2.7 docker==4.0.2 -gitpython==3.0.0 +gitpython==3.0.1 pytz==2019.2 pyudev==0.21.0 uvloop==0.12.2