Handle python-dbus not installed

pull/1969/head^2
Willem Melching 4 years ago
parent c3b5ef8d4b
commit 25054cdc05
  1. 6
      common/hardware_tici.py
  2. 5
      selfdrive/loggerd/uploader.py

@ -25,7 +25,11 @@ MM_MODEM_ACCESS_TECHNOLOGY_LTE = 1 << 14
class Tici(HardwareBase): class Tici(HardwareBase):
def __init__(self): 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.bus = dbus.SystemBus()
self.nm = self.bus.get_object(NM, '/org/freedesktop/NetworkManager') self.nm = self.bus.get_object(NM, '/org/freedesktop/NetworkManager')

@ -69,7 +69,10 @@ def clear_locks(root):
cloudlog.exception("clear_locks failed") cloudlog.exception("clear_locks failed")
def is_on_wifi(): 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(): class Uploader():
def __init__(self, dongle_id, root): def __init__(self, dongle_id, root):

Loading…
Cancel
Save