commit: 1334caaf34b1b869565186c35eebca72dbc12f6a Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Tue Nov 4 02:31:59 2025 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Nov 4 02:35:47 2025 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=1334caaf
bin: add if __name__ == "__main__" for python 3.14 Bug: https://bugs.gentoo.org/965514 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> bin/eclean | 13 +++++++------ bin/eclean-dist | 13 +++++++------ bin/eclean-pkg | 13 +++++++------ bin/ekeyword | 13 +++++++------ bin/enalyze | 23 ++++++++++++----------- bin/epkginfo | 45 +++++++++++++++++++++++---------------------- bin/equery | 35 ++++++++++++++++++----------------- bin/merge-driver-ekeyword | 3 ++- bin/revdep-rebuild | 25 +++++++++++++------------ 9 files changed, 96 insertions(+), 87 deletions(-) diff --git a/bin/eclean b/bin/eclean index c315c88..20ab326 100755 --- a/bin/eclean +++ b/bin/eclean @@ -37,9 +37,10 @@ except KeyboardInterrupt: from gentoolkit.eclean.cli import main -try: - main() -except KeyboardInterrupt: - print("Aborted.") - sys.exit(130) -sys.exit(0) +if __name__ == "__main__": + try: + main() + except KeyboardInterrupt: + print("Aborted.") + sys.exit(130) + sys.exit(0) diff --git a/bin/eclean-dist b/bin/eclean-dist index c315c88..20ab326 100755 --- a/bin/eclean-dist +++ b/bin/eclean-dist @@ -37,9 +37,10 @@ except KeyboardInterrupt: from gentoolkit.eclean.cli import main -try: - main() -except KeyboardInterrupt: - print("Aborted.") - sys.exit(130) -sys.exit(0) +if __name__ == "__main__": + try: + main() + except KeyboardInterrupt: + print("Aborted.") + sys.exit(130) + sys.exit(0) diff --git a/bin/eclean-pkg b/bin/eclean-pkg index c315c88..20ab326 100755 --- a/bin/eclean-pkg +++ b/bin/eclean-pkg @@ -37,9 +37,10 @@ except KeyboardInterrupt: from gentoolkit.eclean.cli import main -try: - main() -except KeyboardInterrupt: - print("Aborted.") - sys.exit(130) -sys.exit(0) +if __name__ == "__main__": + try: + main() + except KeyboardInterrupt: + print("Aborted.") + sys.exit(130) + sys.exit(0) diff --git a/bin/ekeyword b/bin/ekeyword index c45ff5c..1919e65 100755 --- a/bin/ekeyword +++ b/bin/ekeyword @@ -33,9 +33,10 @@ except KeyboardInterrupt: from gentoolkit.ekeyword import ekeyword -try: - ekeyword.main(sys.argv[1:]) -except KeyboardInterrupt: - print("Aborted.") - sys.exit(130) -sys.exit(0) +if __name__ == "__main__": + try: + ekeyword.main(sys.argv[1:]) + except KeyboardInterrupt: + print("Aborted.") + sys.exit(130) + sys.exit(0) diff --git a/bin/enalyze b/bin/enalyze index caa3362..4cc121e 100755 --- a/bin/enalyze +++ b/bin/enalyze @@ -31,14 +31,15 @@ except KeyboardInterrupt: from gentoolkit import enalyze, errors -try: - enalyze.main() -except errors.GentoolkitException as err: - if '--debug' in sys.argv: - raise - else: - from gentoolkit import pprinter as pp - sys.stderr.write(pp.error(str(err))) - print() - print("Add '--debug' to global options for traceback.") - sys.exit(1) +if __name__ == "__main__": + try: + enalyze.main() + except errors.GentoolkitException as err: + if '--debug' in sys.argv: + raise + else: + from gentoolkit import pprinter as pp + sys.stderr.write(pp.error(str(err))) + print() + print("Add '--debug' to global options for traceback.") + sys.exit(1) diff --git a/bin/epkginfo b/bin/epkginfo index 29c4c4d..319a36b 100755 --- a/bin/epkginfo +++ b/bin/epkginfo @@ -26,27 +26,28 @@ def print_epkginfo_help(): print_help(with_usage=False) -equery.initialize_configuration() -args = sys.argv[1:] -if not args or {'-h', '--help'}.intersection(args): - print_epkginfo_help() -else: - try: - main(args) - except AmbiguousPackageName as e: - pkgs = e.args[0] - for candidate in pkgs: - print(candidate) - - from gentoolkit import pprinter as pp - from os.path import basename # To get the short name - - print(file=sys.stderr) - print(pp.error("The short ebuild name '%s' is ambiguous. Please specify" % basename(pkgs[0])), - file=sys.stderr, end="") - pp.die(1, "one of the above fully-qualified ebuild names instead.") - except errors.GentoolkitException as err: - from gentoolkit import pprinter as pp - pp.die(1, str(err)) +if __name__ == "__main__": + equery.initialize_configuration() + args = sys.argv[1:] + if not args or {'-h', '--help'}.intersection(args): + print_epkginfo_help() + else: + try: + main(args) + except AmbiguousPackageName as e: + pkgs = e.args[0] + for candidate in pkgs: + print(candidate) + + from gentoolkit import pprinter as pp + from os.path import basename # To get the short name + + print(file=sys.stderr) + print(pp.error("The short ebuild name '%s' is ambiguous. Please specify" % basename(pkgs[0])), + file=sys.stderr, end="") + pp.die(1, "one of the above fully-qualified ebuild names instead.") + except errors.GentoolkitException as err: + from gentoolkit import pprinter as pp + pp.die(1, str(err)) # vim: set ts=4 sw=4 tw=79: diff --git a/bin/equery b/bin/equery index 3b3e850..956df7e 100755 --- a/bin/equery +++ b/bin/equery @@ -37,20 +37,21 @@ def formatwarning(message, category, filename, llineno, line=None): return pp.warn(str(message)) -if '--debug' not in sys.argv and not bool(os.getenv('DEBUG', False)): - warnings.formatwarning = formatwarning - -try: - equery.main(sys.argv) -except errors.GentoolkitNonZeroExit as err: - sys.exit(err.return_code) -except errors.GentoolkitException as err: - if '--debug' in sys.argv or bool(os.getenv('DEBUG', False)): - raise - else: - from gentoolkit import pprinter as pp - sys.stderr.write(pp.error(str(err))) - if err.is_serious: - print() - print("Add '--debug' to global options for traceback.") - sys.exit(1) +if __name__ == "__main__": + if '--debug' not in sys.argv and not bool(os.getenv('DEBUG', False)): + warnings.formatwarning = formatwarning + + try: + equery.main(sys.argv) + except errors.GentoolkitNonZeroExit as err: + sys.exit(err.return_code) + except errors.GentoolkitException as err: + if '--debug' in sys.argv or bool(os.getenv('DEBUG', False)): + raise + else: + from gentoolkit import pprinter as pp + sys.stderr.write(pp.error(str(err))) + if err.is_serious: + print() + print("Add '--debug' to global options for traceback.") + sys.exit(1) diff --git a/bin/merge-driver-ekeyword b/bin/merge-driver-ekeyword index 53dbcad..074b863 100755 --- a/bin/merge-driver-ekeyword +++ b/bin/merge-driver-ekeyword @@ -8,4 +8,5 @@ import sys from gentoolkit.merge_driver_ekeyword import merge_driver_ekeyword -sys.exit(merge_driver_ekeyword.main(sys.argv[1:])) +if __name__ == "__main__": + sys.exit(merge_driver_ekeyword.main(sys.argv[1:])) diff --git a/bin/revdep-rebuild b/bin/revdep-rebuild index 332dfcf..3c7f54b 100755 --- a/bin/revdep-rebuild +++ b/bin/revdep-rebuild @@ -32,15 +32,16 @@ except KeyboardInterrupt: from gentoolkit import errors from gentoolkit.revdep_rebuild import rebuild -try: - success = rebuild.main(rebuild.parse_options()) - sys.exit(success) -except errors.GentoolkitException as err: - if '--debug' in sys.argv: - raise - else: - from gentoolkit import pprinter as pp - sys.stderr.write(pp.error(str(err))) - print() - print("Add '--debug' to global options for traceback.") - sys.exit(1) +if __name__ == "__main__": + try: + success = rebuild.main(rebuild.parse_options()) + sys.exit(success) + except errors.GentoolkitException as err: + if '--debug' in sys.argv: + raise + else: + from gentoolkit import pprinter as pp + sys.stderr.write(pp.error(str(err))) + print() + print("Add '--debug' to global options for traceback.") + sys.exit(1)
