From e29177fcd2950199afa4f83673c0771afb261123 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 4 Apr 2021 04:18:01 -0700 Subject: [PATCH] repoman: fix --version TypeError Bug: https://bugs.gentoo.org/779967 Signed-off-by: Zac Medico --- repoman/lib/repoman/main.py | 2 +- repoman/lib/repoman/tests/simple/test_simple.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/repoman/lib/repoman/main.py b/repoman/lib/repoman/main.py index 78be31df39..d84abf3ae6 100755 --- a/repoman/lib/repoman/main.py +++ b/repoman/lib/repoman/main.py @@ -82,7 +82,7 @@ def _repoman_init(argv): if options.version: print("Repoman", VERSION, "(portage-%s)" % portage.VERSION) - return _repoman_main_vars(exitcode=0) + return _repoman_main_vars(None, 0, None, None, None, None, None) logger = logging.getLogger() diff --git a/repoman/lib/repoman/tests/simple/test_simple.py b/repoman/lib/repoman/tests/simple/test_simple.py index 60c62acc1a..c4a864ff86 100644 --- a/repoman/lib/repoman/tests/simple/test_simple.py +++ b/repoman/lib/repoman/tests/simple/test_simple.py @@ -66,7 +66,7 @@ def _subprocess(args, cwd, env, expected, debug): args = ["-vvvv"] + args repoman_vars = _repoman_init(["repoman"] + args) if repoman_vars.exitcode is not None: - return repoman_vars.exitcode + return {"returncode": repoman_vars.exitcode} result = _repoman_scan(*repoman_vars) returncode = _handle_result(*repoman_vars, result) qawarnings = repoman_vars.vcs_settings.qatracker.qawarnings @@ -313,6 +313,7 @@ async def _async_test_simple( } git_test = ( + ("", RepomanRun(args=["--version"])), ("", RepomanRun(args=["manifest"])), ("", git_cmd + ("config", "--global", "user.name", committer_name,)), ("", git_cmd + ("config", "--global", "user.email", committer_email,)),