From b4d359808f455f64f3cfb9910d95ccb210c64a8b Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sun, 2 Apr 2017 17:42:45 +0200 Subject: [PATCH] dbus: support storage argument for ImagesDelete Signed-off-by: Giuseppe Scrivano Closes: #958 Approved by: rhatdan --- atomic_dbus.py | 5 +++-- atomic_dbus_client.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/atomic_dbus.py b/atomic_dbus.py index 16d053d..f21493a 100755 --- a/atomic_dbus.py +++ b/atomic_dbus.py @@ -246,13 +246,14 @@ class atomic_dbus(slip.dbus.service.Object): # atomic containers section # The ImagesDelete method will delete one or more images on the system. @slip.dbus.polkit.require_auth("org.atomic.readwrite") - @dbus.service.method("org.atomic", in_signature='asbb', out_signature='i') - def ImagesDelete(self, images, force, remote): + @dbus.service.method("org.atomic", in_signature='asbbs', out_signature='i') + def ImagesDelete(self, images, force, remote, storage): i = Delete() args = self.Args() args.delete_targets = images args.remote = remote args.force = force + args.storage = storage args.assumeyes = True i.set_args(args) return i.delete_image() diff --git a/atomic_dbus_client.py b/atomic_dbus_client.py index d8661ac..72e193b 100755 --- a/atomic_dbus_client.py +++ b/atomic_dbus_client.py @@ -68,10 +68,10 @@ class AtomicDBus (object): return ret @polkit.enable_proxy - def ImagesDelete(self, images, force=False, remote=False): + def ImagesDelete(self, images, force=False, remote=False, storage='docker'): if not isinstance(images, (list, tuple)): images = [ images ] - return self.dbus_object.ImagesDelete(images, force, remote, dbus_interface="org.atomic") + return self.dbus_object.ImagesDelete(images, force, remote, storage, dbus_interface="org.atomic") @polkit.enable_proxy def ImagesHelp(self, image):