From 0e477deeabb51e99ce4f85538b079ed8b42b250d Mon Sep 17 00:00:00 2001 From: Joerg Behrmann Date: Sat, 8 Aug 2020 18:54:29 +0200 Subject: [PATCH] Fix entrypoint installation --- mkosi/__main__.py | 33 +++++++++++++++++++-------------- setup.py | 2 +- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/mkosi/__main__.py b/mkosi/__main__.py index 0ba6a4785..ae890608d 100644 --- a/mkosi/__main__.py +++ b/mkosi/__main__.py @@ -6,18 +6,23 @@ import sys from . import parse_args, complete_step, run_verb, die, MkosiException -try: - args = parse_args() +def main() -> None: + try: + args = parse_args() - for job_name, a in args.items(): - # Change working directory if --directory is passed - if a.directory: - work_dir = a.directory - if os.path.isdir(work_dir): - os.chdir(work_dir) - else: - die(f"Error: {work_dir} is not a directory!") - with complete_step(f"Processing {job_name}"): - run_verb(a) -except MkosiException: - sys.exit(1) + for job_name, a in args.items(): + # Change working directory if --directory is passed + if a.directory: + work_dir = a.directory + if os.path.isdir(work_dir): + os.chdir(work_dir) + else: + die(f"Error: {work_dir} is not a directory!") + with complete_step(f"Processing {job_name}"): + run_verb(a) + except MkosiException: + sys.exit(1) + + +if __name__ == "__main__": + main() diff --git a/setup.py b/setup.py index 92038ad47..6006e1fe4 100755 --- a/setup.py +++ b/setup.py @@ -28,5 +28,5 @@ setup( packages = ["mkosi"], cmdclass = { "man": BuildManpage }, data_files = [('share/man/man1', ["man/mkosi.1"])], - entry_points = {"console_scripts": ["mkosi=mkosi.__main__"]}, + entry_points = {"console_scripts": ["mkosi=mkosi.__main__:main"]}, ) -- 2.47.2