aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xrepoman/lib/repoman/main.py2
-rw-r--r--repoman/lib/repoman/tests/simple/test_simple.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/repoman/lib/repoman/main.py b/repoman/lib/repoman/main.py
index 78be31df3..d84abf3ae 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 60c62acc1..c4a864ff8 100644
--- a/repoman/lib/repoman/tests/simple/test_simple.py
+++ b/repoman/lib/repoman/tests/simple/test_simple.py
@@ -66,7 +66,7 @@ class RepomanRun(types.SimpleNamespace):
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 @@ pkg_preinst() {
}
git_test = (
+ ("", RepomanRun(args=["--version"])),
("", RepomanRun(args=["manifest"])),
("", git_cmd + ("config", "--global", "user.name", committer_name,)),
("", git_cmd + ("config", "--global", "user.email", committer_email,)),