aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2021-03-28 15:54:48 -0700
committerZac Medico <zmedico@gentoo.org>2021-03-28 15:58:18 -0700
commit050592ba4be9eac4af714a8c34f9f89984962b28 (patch)
tree0dc2d09d958d93b78ef76fbf57fd7ba4cac68b57
parentSimpleRepomanTestCase: use asyncio (diff)
downloadportage-050592ba4be9eac4af714a8c34f9f89984962b28.tar.gz
portage-050592ba4be9eac4af714a8c34f9f89984962b28.tar.bz2
portage-050592ba4be9eac4af714a8c34f9f89984962b28.zip
repoman: change sys.exit in actions.py to return in main.py
Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rw-r--r--repoman/lib/repoman/actions.py1
-rwxr-xr-xrepoman/lib/repoman/main.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/repoman/lib/repoman/actions.py b/repoman/lib/repoman/actions.py
index 0f89572b9..351df07be 100644
--- a/repoman/lib/repoman/actions.py
+++ b/repoman/lib/repoman/actions.py
@@ -307,7 +307,6 @@ the whole commit message to abort.
utilities.repoman_sez(
"\"Make your QA payment on time"
" and you'll never see the likes of me.\"\n")
- sys.exit(1)
def _fail(self, result, can_force):
diff --git a/repoman/lib/repoman/main.py b/repoman/lib/repoman/main.py
index a694410d7..78be31df3 100755
--- a/repoman/lib/repoman/main.py
+++ b/repoman/lib/repoman/main.py
@@ -222,5 +222,7 @@ def _handle_result(can_force, exitcode, options, qadata, repo_settings, scanner,
if actions.inform(can_force.get(), result):
# perform any other actions
actions.perform(qa_output)
+ elif result['fail']:
+ return 1
return 0