diff options
| author | Simon Schampijer <simon@schampijer.de> | 2008-04-26 18:11:38 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2008-04-26 18:11:38 (GMT) |
| commit | 8c4a1958d768dbc073a31254616fc950338bad1b (patch) | |
| tree | 17a36b23e058c2defc5fc793eebc0c889a265964 /src/hardware | |
| parent | 508eb82f64eb1b8445779391c5959083a15085db (diff) | |
pylint hardware (part 2, remove unnecessary Runtime error)
Diffstat (limited to 'src/hardware')
| -rw-r--r-- | src/hardware/nmclient.py | 6 | ||||
| -rw-r--r-- | src/hardware/nminfo.py | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/hardware/nmclient.py b/src/hardware/nmclient.py index ca31a76..626b276 100644 --- a/src/hardware/nmclient.py +++ b/src/hardware/nmclient.py @@ -512,10 +512,8 @@ class NMClient(gobject.GObject): self._update_timer = 0 self._devices = {} - try: - self.nminfo = nminfo.NMInfo(self) - except RuntimeError: - pass + self.nminfo = nminfo.NMInfo(self) + self._setup_dbus() if self._nm_present: self._get_initial_devices() diff --git a/src/hardware/nminfo.py b/src/hardware/nminfo.py index 117cc4b..e561ff1 100644 --- a/src/hardware/nminfo.py +++ b/src/hardware/nminfo.py @@ -359,11 +359,10 @@ class NMInfoDBusServiceHelper(dbus.service.Object): "org.freedesktop.NetworkManagerInfo", dbus_interface='org.freedesktop.DBus') except dbus.DBusException: - pass + logging.debug("Error getting owner of NMI") if name: - logging.debug("NMI service already owned by %s, won't claim it." + logging.info("NMI service already owned by %s, won't claim it." % name) - raise RuntimeError bus_name = dbus.service.BusName(NM_INFO_IFACE, bus=bus) dbus.service.Object.__init__(self, bus_name, NM_INFO_PATH) |