IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-23 07:33:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

client: fix script execution

Browse Source 
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>
This commit is contained in:
Martin Basti 2016-10-31 13:13:14 +01:00 committed by Jan Cholasta
parent 1f65c07524
commit 8cbbb53591
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/ipa-client-install
View File

@ -257,15 +257,16 @@ def main():
return rval return rval
try:
if __name__ == "__main__": if __name__ == "__main__":
sys.exit(main())
except KeyboardInterrupt:
sys.exit(1)
except RuntimeError as e:
sys.exit(e)
finally:
try: try:
os.remove(client.CCACHE_FILE) sys.exit(main())
except Exception: except KeyboardInterrupt:
pass sys.exit(1)
except RuntimeError as e:
sys.exit(e)
finally:
try:
os.remove(client.CCACHE_FILE)
except Exception:
pass