Fix version merge

hassio/addons/data.py

@@ -118,7 +118,7 @@ class Data(JsonConfig):
                 addon_config[ATTR_LOCATON] = str(addon.parent)
                 self._cache[addon_slug] = addon_config
 
-            except OSError:
+            except (OSError, json.JSONDecodeError):
                 _LOGGER.warning("Can't read %s", addon)
 
             except vol.Invalid as ex:

hassio/const.py

@@ -1,7 +1,7 @@
 """Const file for HassIO."""
 from pathlib import Path
 
-HASSIO_VERSION = '0.49'
+HASSIO_VERSION = '0.50'
 
 URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
                       'hassio/master/version.json')

hassio/hardware.py

@@ -48,7 +48,7 @@ class Hardware(object):
         """Return all disk devices."""
         dev_list = set()
         for device in self.context.list_devices(subsystem='block'):
-            if 'ID_VENDOR' in device:
+            if device.device_node.startswith('/dev/sd'):
                 dev_list.add(device.device_node)
 
         return list(dev_list)

version.json

@@ -1,5 +1,5 @@
 {
-    "hassio": "0.49",
+    "hassio": "0.50",
     "homeassistant": "0.50",
     "resinos": "1.0",
     "resinhup": "0.3",