summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2016-10-31 13:13:14 +0100
committerJan Cholasta <jcholast@redhat.com>2016-11-11 12:13:56 +0100
commit8cbbb5359155446be22a5efb1e2372e527d2d745 (patch)
tree6ddd4059cc2e2916900401c49be8804720822798 /client
parent1f65c07524c8cf80996de9f6250a4e19c3a043c9 (diff)
downloadfreeipa-8cbbb5359155446be22a5efb1e2372e527d2d745.tar.gz
freeipa-8cbbb5359155446be22a5efb1e2372e527d2d745.tar.xz
freeipa-8cbbb5359155446be22a5efb1e2372e527d2d745.zip
client: fix script execution
if __name__ == "__main__" should be first instead of try block. We want execute it only when file was executed as script https://fedorahosted.org/freeipa/ticket/6392 Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'client')
-rwxr-xr-xclient/ipa-client-install23
1 files changed, 12 insertions, 11 deletions
diff --git a/client/ipa-client-install b/client/ipa-client-install
index 0dfb2f671..ecb3a14a4 100755
--- a/client/ipa-client-install
+++ b/client/ipa-client-install
@@ -257,15 +257,16 @@ def main():
return rval
-try:
- if __name__ == "__main__":
- sys.exit(main())
-except KeyboardInterrupt:
- sys.exit(1)
-except RuntimeError as e:
- sys.exit(e)
-finally:
+
+if __name__ == "__main__":
try:
- os.remove(client.CCACHE_FILE)
- except Exception:
- pass
+ sys.exit(main())
+ except KeyboardInterrupt:
+ sys.exit(1)
+ except RuntimeError as e:
+ sys.exit(e)
+ finally:
+ try:
+ os.remove(client.CCACHE_FILE)
+ except Exception:
+ pass