From d47396f4da4caa1ec70a45da6da8aa7cb897d5ec Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Mon, 14 Dec 2020 15:04:17 +0100 Subject: [PATCH] Handle python-dbus not installed old-commit-hash: 25054cdc0538a0324b7f7c1bcc9d6166291b4e10 --- common/hardware_tici.py | 6 +++++- selfdrive/loggerd/uploader.py | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/common/hardware_tici.py b/common/hardware_tici.py index 2aec9b2e5d..aac7a229ca 100644 --- a/common/hardware_tici.py +++ b/common/hardware_tici.py @@ -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') diff --git a/selfdrive/loggerd/uploader.py b/selfdrive/loggerd/uploader.py index 456712f2bc..354896c180 100644 --- a/selfdrive/loggerd/uploader.py +++ b/selfdrive/loggerd/uploader.py @@ -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):