From 89d86dac0a13063a11deaa8ef31f9fb2fcbc1ff7 Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Wed, 12 Aug 2020 18:19:24 +0300 Subject: [PATCH] uninstall: Don't fail on missing /var/lib/samba On some distros freeipa-server package may not depend on `/var/lib/samba` directory. In this case an uninstallation of ipaserver fails. Fixes: https://pagure.io/freeipa/issue/8461 Signed-off-by: Stanislav Levin Reviewed-By: Alexander Bokovoy --- ipaserver/install/adtrustinstance.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index c51848d9b..a7a403f37 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -899,10 +899,11 @@ class ADTRUSTInstance(service.Service): ipautil.remove_file(self.smb_conf) # Remove samba's persistent and temporary tdb files - tdb_files = [tdb_file for tdb_file in os.listdir(paths.SAMBA_DIR) - if tdb_file.endswith(".tdb")] - for tdb_file in tdb_files: - ipautil.remove_file(tdb_file) + if os.path.isdir(paths.SAMBA_DIR): + tdb_files = [tdb_file for tdb_file in os.listdir(paths.SAMBA_DIR) + if tdb_file.endswith(".tdb")] + for tdb_file in tdb_files: + ipautil.remove_file(tdb_file) # Remove our keys from samba's keytab self.clean_samba_keytab()