|
|
25db28 |
diff --git a/slip/dbus/polkit.py b/slip/dbus/polkit.py
|
|
|
25db28 |
index e92db4d..cc3dbd8 100644
|
|
|
25db28 |
--- a/slip/dbus/polkit.py
|
|
|
25db28 |
+++ b/slip/dbus/polkit.py
|
|
|
25db28 |
@@ -206,17 +206,17 @@ class PolKit(object):
|
|
|
25db28 |
@property
|
|
|
25db28 |
def _interface(self):
|
|
|
25db28 |
if not PolKit.__interface:
|
|
|
25db28 |
- PolKit.__interface = dbus.Interface(self._bus.get_object(
|
|
|
25db28 |
- self._dbus_name, self._dbus_path),
|
|
|
25db28 |
- self._dbus_interface)
|
|
|
25db28 |
+ try:
|
|
|
25db28 |
+ PolKit.__interface = dbus.Interface(self._bus.get_object(
|
|
|
25db28 |
+ self._dbus_name, self._dbus_path),
|
|
|
25db28 |
+ self._dbus_interface)
|
|
|
25db28 |
+ except dbus.DBusException:
|
|
|
25db28 |
+ pass
|
|
|
25db28 |
return PolKit.__interface
|
|
|
25db28 |
|
|
|
25db28 |
@property
|
|
|
25db28 |
def _polkit_present(self):
|
|
|
25db28 |
- try:
|
|
|
25db28 |
- return bool(self._interface)
|
|
|
25db28 |
- except dbus.DBusException:
|
|
|
25db28 |
- return False
|
|
|
25db28 |
+ return bool(self._interface)
|
|
|
25db28 |
|
|
|
25db28 |
def __dbus_system_bus_name_uid(self, system_bus_name):
|
|
|
25db28 |
bus_object = self._bus.get_object(
|
|
|
25db28 |
@@ -258,8 +258,7 @@ class PolKit(object):
|
|
|
25db28 |
challenge=True, details={}):
|
|
|
25db28 |
|
|
|
25db28 |
if not self._polkit_present:
|
|
|
25db28 |
- reply_handler(
|
|
|
25db28 |
- action_id is None or
|
|
|
25db28 |
+ return reply_handler(action_id is None or
|
|
|
25db28 |
self.__dbus_system_bus_name_uid(system_bus_name) == 0)
|
|
|
25db28 |
|
|
|
25db28 |
flags = 0
|