commit: 02f05a69cbd955f2263a80090171039d05328858 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Dec 18 09:54:57 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Dec 18 09:54:57 2025 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=02f05a69
bin: only set signal handlers for main Similar to d7d6fd54f1c936e89c5e4467c6c1f33b217325ca in portage.git. Bug: https://bugs.gentoo.org/941956 Bug: https://bugs.gentoo.org/967199 Signed-off-by: Sam James <sam <AT> gentoo.org> bin/eclean | 9 ++++----- bin/eclean-dist | 8 ++++---- bin/eclean-pkg | 8 ++++---- bin/ekeyword | 8 ++++---- bin/enalyze | 8 ++++---- bin/equery | 8 ++++---- bin/imlate | 8 ++++---- bin/revdep-rebuild | 9 ++++----- 8 files changed, 32 insertions(+), 34 deletions(-) diff --git a/bin/eclean b/bin/eclean index 20ab326..ddfbef0 100755 --- a/bin/eclean +++ b/bin/eclean @@ -25,11 +25,6 @@ try: signal.signal(signal.SIGTERM, signal.SIG_IGN) print() sys.exit(1) - - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) - except KeyboardInterrupt: print() sys.exit(1) @@ -38,6 +33,10 @@ except KeyboardInterrupt: from gentoolkit.eclean.cli import main if __name__ == "__main__": + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) + try: main() except KeyboardInterrupt: diff --git a/bin/eclean-dist b/bin/eclean-dist index 20ab326..8285a76 100755 --- a/bin/eclean-dist +++ b/bin/eclean-dist @@ -26,10 +26,6 @@ try: print() sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) - except KeyboardInterrupt: print() sys.exit(1) @@ -38,6 +34,10 @@ except KeyboardInterrupt: from gentoolkit.eclean.cli import main if __name__ == "__main__": + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) + try: main() except KeyboardInterrupt: diff --git a/bin/eclean-pkg b/bin/eclean-pkg index 20ab326..8285a76 100755 --- a/bin/eclean-pkg +++ b/bin/eclean-pkg @@ -26,10 +26,6 @@ try: print() sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) - except KeyboardInterrupt: print() sys.exit(1) @@ -38,6 +34,10 @@ except KeyboardInterrupt: from gentoolkit.eclean.cli import main if __name__ == "__main__": + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) + try: main() except KeyboardInterrupt: diff --git a/bin/ekeyword b/bin/ekeyword index 1919e65..3ee7dfa 100755 --- a/bin/ekeyword +++ b/bin/ekeyword @@ -23,10 +23,6 @@ try: print() sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) - except KeyboardInterrupt: print() sys.exit(1) @@ -34,6 +30,10 @@ except KeyboardInterrupt: from gentoolkit.ekeyword import ekeyword if __name__ == "__main__": + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) + try: ekeyword.main(sys.argv[1:]) except KeyboardInterrupt: diff --git a/bin/enalyze b/bin/enalyze index 4cc121e..301bb69 100755 --- a/bin/enalyze +++ b/bin/enalyze @@ -21,10 +21,6 @@ try: print() sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) - except KeyboardInterrupt: print() sys.exit(1) @@ -32,6 +28,10 @@ except KeyboardInterrupt: from gentoolkit import enalyze, errors if __name__ == "__main__": + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) + try: enalyze.main() except errors.GentoolkitException as err: diff --git a/bin/equery b/bin/equery index 956df7e..0b9d8cd 100755 --- a/bin/equery +++ b/bin/equery @@ -20,10 +20,6 @@ try: print() sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) - except KeyboardInterrupt: print() sys.exit(1) @@ -38,6 +34,10 @@ def formatwarning(message, category, filename, llineno, line=None): if __name__ == "__main__": + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) + if '--debug' not in sys.argv and not bool(os.getenv('DEBUG', False)): warnings.formatwarning = formatwarning diff --git a/bin/imlate b/bin/imlate index 318d612..58f7294 100755 --- a/bin/imlate +++ b/bin/imlate @@ -23,10 +23,6 @@ try: print() sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) - except KeyboardInterrupt: print() sys.exit(1) @@ -34,6 +30,10 @@ except KeyboardInterrupt: from gentoolkit.imlate import imlate try: + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) + imlate.main() except KeyboardInterrupt: print("Aborted.") diff --git a/bin/revdep-rebuild b/bin/revdep-rebuild index 3c7f54b..aacf49d 100755 --- a/bin/revdep-rebuild +++ b/bin/revdep-rebuild @@ -20,11 +20,6 @@ try: print() sys.exit(1) - signal.signal(signal.SIGINT, exithandler) - signal.signal(signal.SIGTERM, exithandler) - signal.signal(signal.SIGPIPE, signal.SIG_DFL) - - except KeyboardInterrupt: print() sys.exit(1) @@ -33,6 +28,10 @@ from gentoolkit import errors from gentoolkit.revdep_rebuild import rebuild if __name__ == "__main__": + signal.signal(signal.SIGINT, exithandler) + signal.signal(signal.SIGTERM, exithandler) + signal.signal(signal.SIGPIPE, signal.SIG_DFL) + try: success = rebuild.main(rebuild.parse_options()) sys.exit(success)
