From d22737c9d6acee050b1af94006dddea053c72fcd Mon Sep 17 00:00:00 2001 From: Douglas Raillard Date: Tue, 6 Feb 2024 16:40:33 +0000 Subject: [PATCH] tools: Remove main() call FIX Since we use a script entry point, remove the call to main() upon import in the main module. --- tools/batch-rebase/src/batch_rebase/main.py | 7 ++++--- tools/exekall/src/exekall/main.py | 4 ---- .../src/lisa_combine_gitlab_mr/main.py | 2 -- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tools/batch-rebase/src/batch_rebase/main.py b/tools/batch-rebase/src/batch_rebase/main.py index ceef0d0c6..51e08d043 100755 --- a/tools/batch-rebase/src/batch_rebase/main.py +++ b/tools/batch-rebase/src/batch_rebase/main.py @@ -512,7 +512,7 @@ def do_stat(repo, tip, base): print('\nTotal commits: {}'.format(total)) return 0 -def main(): +def _main(): logging.basicConfig( level=logging.INFO, format='[%(levelname)s] %(message)s' @@ -751,7 +751,8 @@ def main(): return ret -if __name__ == '__main__': - sys.exit(main()) + +def main(): + sys.exit(_main()) # vim :set tabstop=4 shiftwidth=4 textwidth=80 expandtab diff --git a/tools/exekall/src/exekall/main.py b/tools/exekall/src/exekall/main.py index a3892e99a..13602ab0b 100755 --- a/tools/exekall/src/exekall/main.py +++ b/tools/exekall/src/exekall/main.py @@ -1356,7 +1356,3 @@ def main(argv=sys.argv[1:]): return_code = GENERIC_ERROR_CODE sys.exit(return_code) - - -if __name__ == '__main__': - main() diff --git a/tools/lisa-combine-gitlab-mr/src/lisa_combine_gitlab_mr/main.py b/tools/lisa-combine-gitlab-mr/src/lisa_combine_gitlab_mr/main.py index fe7869f3c..8ba752b7a 100755 --- a/tools/lisa-combine-gitlab-mr/src/lisa_combine_gitlab_mr/main.py +++ b/tools/lisa-combine-gitlab-mr/src/lisa_combine_gitlab_mr/main.py @@ -176,5 +176,3 @@ def main(): cmd = ['batch-rebase', 'create', '.', '--manifest', manifest, '--create-branch', branch] logging.info(f'Running {" ".join(map(str, cmd))}') subprocess.check_call(cmd) - -main() -- GitLab