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 version conflicts

Browse Source
This commit is contained in:
Pascal Vizeli 2018-02-26 22:53:31 +01:00
commit 0dacbb31be
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hassio/const.py
View File

@ -2,7 +2,7 @@
from pathlib import Path from pathlib import Path
from ipaddress import ip_network from ipaddress import ip_network
HASSIO_VERSION = '0.94' HASSIO_VERSION = '0.95'
URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/' URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
'hassio/{}/version.json') 'hassio/{}/version.json')

14
hassio/snapshots/__init__.py
View File

@ -173,14 +173,16 @@ class SnapshotManager(CoreSysAttributes):
if addon and addon.is_installed: if addon and addon.is_installed:
addon_list.append(addon) addon_list.append(addon)
continue continue
_LOGGER.warning("Add-on %s not found", addon_slug) _LOGGER.warning("Add-on %s not found/installed", addon_slug)
_LOGGER.info("Snapshot %s store Add-ons", snapshot.slug) if addon_list:
await snapshot.store_addons(addon_list) _LOGGER.info("Snapshot %s store Add-ons", snapshot.slug)
await snapshot.store_addons(addon_list)
# snapshot folders # Snapshot folders
_LOGGER.info("Snapshot %s store folders", snapshot.slug) if folders:
await snapshot.store_folders(folders) _LOGGER.info("Snapshot %s store folders", snapshot.slug)
await snapshot.store_folders(folders)
except Exception: # pylint: disable=broad-except except Exception: # pylint: disable=broad-except
_LOGGER.exception("Snapshot %s error", snapshot.slug) _LOGGER.exception("Snapshot %s error", snapshot.slug)

4
hassio/snapshots/snapshot.py
View File

@ -151,7 +151,7 @@ class Snapshot(CoreSysAttributes):
def _encrypt_data(self, data): def _encrypt_data(self, data):
"""Make data secure.""" """Make data secure."""
if not self._key: if not self._key or data is None:
return data return data
return b64encode( return b64encode(
@ -159,7 +159,7 @@ class Snapshot(CoreSysAttributes):
def _decrypt_data(self, data): def _decrypt_data(self, data):
"""Make data readable.""" """Make data readable."""
if not self._key: if not self._key or data is None:
return data return data
return Padding.unpad( return Padding.unpad(

2
version.json
View File

@ -1,5 +1,5 @@
{ {
"hassio": "0.94", "hassio": "0.95",
"homeassistant": "0.64.0", "homeassistant": "0.64.0",
"resinos": "1.1", "resinos": "1.1",
"resinhup": "0.3", "resinhup": "0.3",