diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2012-03-20 12:29:36 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-03-23 10:53:13 +0100 |
| commit | 93312d19d8dc5d889d075bf661199eeb98e0a54d (patch) | |
| tree | 7fce27eb45533b4b86b7abd844ca1d8cab9d0941 /install | |
| parent | 5e08fa6efd9edfef875154300e427765b0a009a9 (diff) | |
| download | freeipa.git-93312d19d8dc5d889d075bf661199eeb98e0a54d.tar.gz freeipa.git-93312d19d8dc5d889d075bf661199eeb98e0a54d.tar.xz freeipa.git-93312d19d8dc5d889d075bf661199eeb98e0a54d.zip | |
Wait for child process to terminate after receiving SIGINT in ipautil.run.
Do cleanup on KeyboardInterrupt rather than in custom SIGINT handler in
ipa-replica-conncheck.
https://fedorahosted.org/freeipa/ticket/2127
Diffstat (limited to 'install')
| -rwxr-xr-x | install/tools/ipa-replica-conncheck | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck index 44b3caa4..23411a35 100755 --- a/install/tools/ipa-replica-conncheck +++ b/install/tools/ipa-replica-conncheck @@ -158,12 +158,10 @@ def clean_responders(responders): responders.remove(responder) def sigterm_handler(signum, frame): - print_info("\nCleaning up...") - - global RESPONDERS - clean_responders(RESPONDERS) - - sys.exit(1) + # do what SIGINT does (raise a KeyboardInterrupt) + sigint_handler = signal.getsignal(signal.SIGINT) + if callable(sigint_handler): + sigint_handler(signum, frame) def configure_krb5_conf(realm, kdc, filename): @@ -268,7 +266,6 @@ def main(): root_logger.debug("missing options might be asked for interactively later\n") signal.signal(signal.SIGTERM, sigterm_handler) - signal.signal(signal.SIGINT, sigterm_handler) required_ports = BASE_PORTS if options.check_ca: @@ -384,6 +381,7 @@ if __name__ == "__main__": except SystemExit, e: sys.exit(e) except KeyboardInterrupt: + print_info("\nCleaning up...") sys.exit(1) except RuntimeError, e: sys.exit(e) @@ -395,4 +393,3 @@ if __name__ == "__main__": os.remove(file_name) except OSError: pass - |