[PATCH 2/3] Handle the dbus method call not returning anything.

David Shea dshea at redhat.com
Wed Mar 19 18:04:54 UTC 2014


Sometimes a failed dbus method call doesn't raise an expection.
Sometimes it just doesn't do anything.
---
 pyanaconda/safe_dbus.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pyanaconda/safe_dbus.py b/pyanaconda/safe_dbus.py
index ecb6c15..22a7a04 100644
--- a/pyanaconda/safe_dbus.py
+++ b/pyanaconda/safe_dbus.py
@@ -91,6 +91,11 @@ def dbus_call_safe_sync(service, obj_path, iface, method, args,
                        (method, obj_path, args, gerr.message)
         raise DBusCallError(msg)
 
+    if ret is None:
+        msg = "No return from %s method on %s with %s arguments" % \
+                       (method, obj_path, args)
+        raise DBusCallError(msg)
+
     return ret.unpack()
 
 def dbus_get_property_safe_sync(service, obj_path, iface, prop_name,
-- 
1.8.5.3



More information about the anaconda-patches mailing list