[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/

[Zac Medico]

commit:     050592ba4be9eac4af714a8c34f9f89984962b28
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 28 22:54:48 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Mar 28 22:58:18 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=050592ba

repoman: change sys.exit in actions.py to return in main.py

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 repoman/lib/repoman/actions.py | 1 -
 repoman/lib/repoman/main.py    | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

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