From 6ed06e1ab47ae5cd0d78f71710ce41f5a90d4383 Mon Sep 17 00:00:00 2001 From: Travis Rhoden Date: Wed, 5 Aug 2015 11:15:41 -0700 Subject: [PATCH] [RM-12480] debian: use extra_remove_flags instead of purge flag Signed-off-by: Travis Rhoden --- ceph_deploy/hosts/debian/uninstall.py | 5 ++++- ceph_deploy/util/pkg_managers.py | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ceph_deploy/hosts/debian/uninstall.py b/ceph_deploy/hosts/debian/uninstall.py index 42d0ce4..b3a01b2 100644 --- a/ceph_deploy/hosts/debian/uninstall.py +++ b/ceph_deploy/hosts/debian/uninstall.py @@ -6,7 +6,10 @@ def uninstall(distro, purge=False): 'ceph-fs-common', 'radosgw', ] + extra_remove_flags = [] + if purge: + extra_remove_flags.append('--purge') distro.packager.remove( packages, - purge=purge, + extra_remove_flags=extra_remove_flags ) diff --git a/ceph_deploy/util/pkg_managers.py b/ceph_deploy/util/pkg_managers.py index 8b13677..385c05b 100644 --- a/ceph_deploy/util/pkg_managers.py +++ b/ceph_deploy/util/pkg_managers.py @@ -382,7 +382,7 @@ class Apt(PackageManager): cmd.extend(packages) return self._run(cmd) - def remove(self, packages, purge=False, **kw): + def remove(self, packages, **kw): if isinstance(packages, str): packages = [packages] @@ -397,8 +397,6 @@ class Apt(PackageManager): extra_flags = [extra_flags] cmd.extend(extra_flags) - if purge: - cmd.append('--purge') cmd.extend(packages) return self._run(cmd) -- 2.47.3