From 351c45da75d0fdfec675ab6c82ec5cfdbb48e7e2 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 15 Jun 2020 14:47:27 +0200
Subject: [PATCH] Add the current supervisor version as default (#1791)

* Add the current supervisor version as default

* Fix lint

* Improve new version handling
---
 supervisor/config.py   | 6 +++---
 supervisor/core.py     | 5 +----
 supervisor/validate.py | 3 ++-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/supervisor/config.py b/supervisor/config.py
index 9d8b00ccd..aa2b7f6c1 100644
--- a/supervisor/config.py
+++ b/supervisor/config.py
@@ -3,7 +3,7 @@ from datetime import datetime
 import logging
 import os
 from pathlib import Path, PurePath
-from typing import List, Optional
+from typing import List
 
 from .const import (
     ATTR_ADDONS_CUSTOM_LIST,
@@ -62,9 +62,9 @@ class CoreConfig(JsonConfig):
         self._data[ATTR_TIMEZONE] = value
 
     @property
-    def version(self) -> Optional[str]:
+    def version(self) -> str:
         """Return config version."""
-        return self._data.get(ATTR_VERSION)
+        return self._data[ATTR_VERSION]
 
     @version.setter
     def version(self, value: str) -> None:
diff --git a/supervisor/core.py b/supervisor/core.py
index 5e000a161..14dfb7dd0 100644
--- a/supervisor/core.py
+++ b/supervisor/core.py
@@ -28,10 +28,7 @@ class Core(CoreSysAttributes):
         # If a update is failed?
         if self.sys_dev:
             self.sys_config.version = self.sys_supervisor.version
-        elif (
-            self.sys_config.version
-            and self.sys_config.version != self.sys_supervisor.version
-        ):
+        elif self.sys_config.version != self.sys_supervisor.version:
             self.healthy = False
             _LOGGER.critical("Update of Supervisor fails!")
 
diff --git a/supervisor/validate.py b/supervisor/validate.py
index f579232e6..2701a94e0 100644
--- a/supervisor/validate.py
+++ b/supervisor/validate.py
@@ -37,6 +37,7 @@ from .const import (
     ATTR_WAIT_BOOT,
     ATTR_WATCHDOG,
     LogLevel,
+    SUPERVISOR_VERSION,
     UpdateChannels,
 )
 from .utils.validate import validate_timezone
@@ -176,7 +177,7 @@ SCHEMA_SUPERVISOR_CONFIG = vol.Schema(
     {
         vol.Optional(ATTR_TIMEZONE, default="UTC"): validate_timezone,
         vol.Optional(ATTR_LAST_BOOT): vol.Coerce(str),
-        vol.Optional(ATTR_VERSION): simple_version,
+        vol.Optional(ATTR_VERSION, default=SUPERVISOR_VERSION): simple_version,
         vol.Optional(
             ATTR_ADDONS_CUSTOM_LIST,
             default=["https://github.com/hassio-addons/repository"],