diff options
| -rwxr-xr-x | client/ipa-client-install | 5 | ||||
| -rw-r--r-- | ipaclient/install/client.py | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/client/ipa-client-install b/client/ipa-client-install index ecb3a14a4..98b2aa165 100755 --- a/client/ipa-client-install +++ b/client/ipa-client-install @@ -265,8 +265,3 @@ if __name__ == "__main__": sys.exit(1) except RuntimeError as e: sys.exit(e) - finally: - try: - os.remove(client.CCACHE_FILE) - except Exception: - pass 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) |