Handle python-dbus not installed

old-commit-hash: 25054cdc0538a0324b7f7c1bcc9d6166291b4e10
This commit is contained in:
Willem Melching
2020-12-14 15:04:17 +01:00
parent 442c569812
commit d47396f4da
2 changed files with 9 additions and 2 deletions

View File

@@ -25,7 +25,11 @@ MM_MODEM_ACCESS_TECHNOLOGY_LTE = 1 << 14
class Tici(HardwareBase):
def __init__(self):
import dbus # pylint: disable=import-error
# TODO: remove when dbus is installed everywhere
try:
import dbus # pylint: disable=import-error
except ImportError:
return
self.bus = dbus.SystemBus()
self.nm = self.bus.get_object(NM, '/org/freedesktop/NetworkManager')

View File

@@ -69,7 +69,10 @@ def clear_locks(root):
cloudlog.exception("clear_locks failed")
def is_on_wifi():
return HARDWARE.get_network_type() == NetworkType.wifi
try:
return HARDWARE.get_network_type() == NetworkType.wifi
except Exception:
return False
class Uploader():
def __init__(self, dongle_id, root):