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

[Brian Dolbec]

commit:     6c227bc298a62e2fcaec2a5530af121943b13240
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 00:18:47 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 00:18:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=6c227bc2

Fix regression from which always runs commit mode

fixes commit: e7607003f01c16b34def04d2069a72f140dfe999

 pym/repoman/actions.py | 2 ++
 pym/repoman/main.py    | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index fef53da..9d97b20 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -58,11 +58,13 @@ class Actions(object):
                        self._suggest()
                if self.options.mode != 'commit':
                        self._non_commit(result)
+                       return False
                else:
                        self._fail(result, can_force)
                        if self.options.pretend:
                                utilities.repoman_sez(
                                        "\"So, you want to play it safe. Good 
call.\"\n")
+                       return True
 
 
        def perform(self, qa_output):

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index b6f88b2..1393ff7 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -165,8 +165,8 @@ def repoman_main(argv):
 
        # output the results
        actions = Actions(repo_settings, options, scanner, vcs_settings)
-       actions.inform(can_force, result)
-       # perform any other actions
-       actions.perform(qa_output)
+       if actions.inform(can_force, result)
+               # perform any other actions
+               actions.perform(qa_output)
 
        sys.exit(0)