Merge branch 'main' into handle-config-envs-none

Handle nonetype error for envs on homeassistant stop
2026-02-28 05:07:35 +00:00 · 2026-02-13 09:00:31 +01:00 · 2026-02-12 22:00:21 +00:00
1 changed files with 2 additions and 2 deletions
--- a/supervisor/docker/homeassistant.py
+++ b/supervisor/docker/homeassistant.py
@@ -64,8 +64,8 @@ class DockerHomeAssistant(DockerInterface):
        """Return timeout for Docker actions."""
        # Use S6_SERVICES_GRACETIME to avoid killing Home Assistant Core, see
        # https://github.com/home-assistant/core/tree/dev/Dockerfile
-        if self.meta_config and "Env" in self.meta_config:
-            for env in self.meta_config["Env"]:
+        if self.meta_config and (envs := self.meta_config.get("Env")):
+            for env in envs:
                if match := ENV_S6_GRACETIME.match(env):
                    return 20 + int(int(match.group(1)) / 1000)
Author	SHA1	Message	Date
Stefan Agner	844308d755	Merge branch 'main' into handle-config-envs-none	2026-02-13 09:00:31 +01:00
Mike Degatano	844ce5b318	Handle nonetype error for envs on homeassistant stop	2026-02-12 22:00:21 +00:00