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

New version logic NM (#2466)

Browse Source
This commit is contained in:
Pascal Vizeli 2021-01-26 10:33:35 +01:00 committed by GitHub
parent b59e709dc0
commit 8f54d7c8e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -12,7 +12,6 @@ debugpy==1.2.1
docker==4.4.1 docker==4.4.1
gitpython==3.1.12 gitpython==3.1.12
jinja2==2.11.2 jinja2==2.11.2
packaging==20.4
pulsectl==20.5.1 pulsectl==20.5.1
pytz==2020.5 pytz==2020.5
pyudev==0.22.0 pyudev==0.22.0

12
supervisor/dbus/network/__init__.py
View File

@ -2,7 +2,7 @@
import logging import logging
from typing import Any, Awaitable, Dict from typing import Any, Awaitable, Dict
from packaging.version import parse as pkg_parse from awesomeversion import AwesomeVersion, AwesomeVersionException
import sentry_sdk import sentry_sdk
from ...exceptions import ( from ...exceptions import (
@ -30,7 +30,7 @@ from .settings import NetworkManagerSettings
_LOGGER: logging.Logger = logging.getLogger(__name__) _LOGGER: logging.Logger = logging.getLogger(__name__)
MINIMAL_VERSION = "1.14.6" MINIMAL_VERSION = AwesomeVersion("1.14.6")
class NetworkManager(DBusInterface): class NetworkManager(DBusInterface):
@ -67,9 +67,9 @@ class NetworkManager(DBusInterface):
return self.properties[DBUS_ATTR_CONNECTION_ENABLED] return self.properties[DBUS_ATTR_CONNECTION_ENABLED]
@property @property
def version(self) -> bool: def version(self) -> AwesomeVersion:
"""Return if connectivity check is enabled.""" """Return if connectivity check is enabled."""
return self.properties[DBUS_ATTR_VERSION] return AwesomeVersion(self.properties[DBUS_ATTR_VERSION])
@dbus_connected @dbus_connected
def activate_connection( def activate_connection(
@ -121,9 +121,9 @@ class NetworkManager(DBusInterface):
self.properties = await self.dbus.get_properties(DBUS_NAME_NM) self.properties = await self.dbus.get_properties(DBUS_NAME_NM)
try: try:
if pkg_parse(self.version) >= pkg_parse(MINIMAL_VERSION): if self.version >= MINIMAL_VERSION:
return return
except (TypeError, ValueError, KeyError): except (AwesomeVersionException, KeyError):
pass pass
_LOGGER.error("Version '%s' of NetworkManager is not supported!", self.version) _LOGGER.error("Version '%s' of NetworkManager is not supported!", self.version)