From 2842a83568301c85d340801daae42078333ce63d Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Mon, 29 Jun 2015 10:45:15 +0200 Subject: Fix removal of ipa-kdc-proxy.conf symlink installutils.remove_file() ignored broken symlinks. Now it uses os.path.lexists() to detect and also remove dangling symlinks. Reviewed-By: Fraser Tweedale --- ipaserver/install/httpinstance.py | 2 +- ipaserver/install/installutils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ipaserver/install') diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py index 107c20d7f..f5f2a86fc 100644 --- a/ipaserver/install/httpinstance.py +++ b/ipaserver/install/httpinstance.py @@ -481,8 +481,8 @@ class HTTPInstance(service.Service): installutils.remove_file(paths.HTTPD_IPA_REWRITE_CONF) installutils.remove_file(paths.HTTPD_IPA_CONF) installutils.remove_file(paths.HTTPD_IPA_PKI_PROXY_CONF) - installutils.remove_file(paths.HTTPD_IPA_KDCPROXY_CONF) installutils.remove_file(paths.HTTPD_IPA_KDCPROXY_CONF_SYMLINK) + installutils.remove_file(paths.HTTPD_IPA_KDCPROXY_CONF) # Restore SELinux boolean states boolean_states = {name: self.restore_state(name) diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index 9329a51f5..08620c472 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -657,7 +657,7 @@ def remove_file(filename): Remove a file and log any exceptions raised. """ try: - if os.path.exists(filename): + if os.path.lexists(filename): os.unlink(filename) except Exception, e: root_logger.error('Error removing %s: %s' % (filename, str(e))) -- cgit