diff options
| author | Christian Heimes <cheimes@redhat.com> | 2015-06-29 10:45:15 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2015-06-29 17:24:03 +0200 |
| commit | 2842a83568301c85d340801daae42078333ce63d (patch) | |
| tree | 9ed684190e74334ebc9e854284b808f9f9350c88 /ipaserver/install | |
| parent | 5e92c981b0e433ee28b953d222a1b531b525ff1c (diff) | |
| download | freeipa-2842a83568301c85d340801daae42078333ce63d.tar.gz freeipa-2842a83568301c85d340801daae42078333ce63d.tar.xz freeipa-2842a83568301c85d340801daae42078333ce63d.zip | |
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 <ftweedal@redhat.com>
Diffstat (limited to 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/httpinstance.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/installutils.py | 2 |
2 files changed, 2 insertions, 2 deletions
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))) |