summaryrefslogtreecommitdiffstats
path: root/ipaclient/install/client.py
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2016-10-31 13:22:08 +0100
committerJan Cholasta <jcholast@redhat.com>2016-11-11 12:13:56 +0100
commitbbad08900bbe8f76e59b159cd2af800f5c089ca1 (patch)
treec78813904a16a9a81209dd0bdd76cd11adcbead8 /ipaclient/install/client.py
parent8cbbb5359155446be22a5efb1e2372e527d2d745 (diff)
downloadfreeipa-bbad08900bbe8f76e59b159cd2af800f5c089ca1.tar.gz
freeipa-bbad08900bbe8f76e59b159cd2af800f5c089ca1.tar.xz
freeipa-bbad08900bbe8f76e59b159cd2af800f5c089ca1.zip
client: move clean CCACHE to module
According 04b8575c52410bb6d31e0e55f1cf431d7cc9c7c3 cleaning CCACHE is needed after installation. This commit moves this cleanup from ipa-client-install to client.install() function https://fedorahosted.org/freeipa/ticket/6392 Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipaclient/install/client.py')
-rw-r--r--ipaclient/install/client.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py
index 95d8fcea9..440475b94 100644
--- a/ipaclient/install/client.py
+++ b/ipaclient/install/client.py
@@ -2285,6 +2285,16 @@ def install_check(options):
def install(options):
+ try:
+ return _install(options)
+ finally:
+ try:
+ os.remove(CCACHE_FILE)
+ except Exception:
+ pass
+
+
+def _install(options):
env = {'PATH': SECURE_PATH}
fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE)