]> sourceware.org Git - lvm2.git/commitdiff
lvmdbusd: Be more specific on return types for Lv
authorTony Asleson <tasleson@redhat.com>
Mon, 29 Aug 2016 17:32:20 +0000 (12:32 -0500)
committerTony Asleson <tasleson@redhat.com>
Mon, 29 Aug 2016 20:26:56 +0000 (15:26 -0500)
daemons/lvmdbusd/lv.py

index 6d994acb288b49bcff39968fd77db81c20d92cdb..3d0b78ce41eba251e372c01455fbb20e62450f13 100644 (file)
@@ -103,7 +103,14 @@ class LvState(State):
                        (pv_uuid, pv_name, pv_segs) = pv
                        pv_obj = cfg.om.get_object_path_by_uuid_lvm_id(
                                pv_uuid, pv_name, gen_new=False)
-                       rc.append((pv_obj, pv_segs))
+
+                       segs_decorate = []
+                       for i in pv_segs:
+                               segs_decorate.append((dbus.UInt64(i[0]),
+                                                                       dbus.UInt64(i[1]),
+                                                                       dbus.String(i[2])))
+
+                       rc.append((dbus.ObjectPath(pv_obj), segs_decorate))
 
                return dbus.Array(rc, signature="(oa(tts))")
 
@@ -127,7 +134,7 @@ class LvState(State):
                        op = cfg.om.get_object_path_by_uuid_lvm_id(
                                l[0], full_name, gen_new=False)
                        assert op
-                       rc.append(op)
+                       rc.append(dbus.ObjectPath(op))
                return rc
 
        def __init__(self, Uuid, Name, Path, SizeBytes,
@@ -140,9 +147,9 @@ class LvState(State):
                # value
                self._segs = dbus.Array([], signature='s')
                if not isinstance(segtypes, list):
-                       self._segs.append(segtypes)
+                       self._segs.append(dbus.String(segtypes))
                else:
-                       self._segs.extend(set(segtypes))
+                       self._segs.extend([dbus.String(x) for x in set(segtypes)])
 
                self.Vg = cfg.om.get_object_path_by_uuid_lvm_id(
                        vg_uuid, vg_name, vg_obj_path_generate)
This page took 0.036969 seconds and 5 git commands to generate.