From cc5080bbcd8443df57206416f8d22d5a4be6bf49 Mon Sep 17 00:00:00 2001 From: Mia McMahill Date: Fri, 26 Jun 2026 19:54:49 -0500 Subject: [PATCH] flatpak-coredumpctl: Create main function called from __main__ This constraints the scope of the variables within instead of unnecessarily creating global variables, and it makes it easier to keep only a single sys.exit --- scripts/flatpak-coredumpctl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/flatpak-coredumpctl b/scripts/flatpak-coredumpctl index 7dca2f7ad..b86f7af34 100755 --- a/scripts/flatpak-coredumpctl +++ b/scripts/flatpak-coredumpctl @@ -265,11 +265,11 @@ def list_dumps(show_inaccessible: bool, use_pager: bool, reverse: bool, matches: return 0 -if __name__ == "__main__": +def main() -> int: if not shutil.which("coredumpctl"): print("'coredumpctl' is required but could not be found in PATH", file=sys.stderr) - sys.exit(1) + return 1 parser = argparse.ArgumentParser(description= "Inspect and debug application coredumps from Flatpaks. " @@ -309,7 +309,7 @@ if __name__ == "__main__": except ValueError as e: print(e, file=sys.stderr) debug_parser.print_help(sys.stderr) - sys.exit(1) + return 1 exit_code = debug_dump(validated_args) case "list": exit_code = list_dumps( @@ -320,6 +320,9 @@ if __name__ == "__main__": ) case _: parser.print_help(sys.stderr) - sys.exit(1) + return 1 - sys.exit(exit_code) + return exit_code + +if __name__ == "__main__": + sys.exit(main())