From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 43DC71384AE for ; Sun, 20 Sep 2015 00:20:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8490EE087F; Sun, 20 Sep 2015 00:20:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2F737E087F for ; Sun, 20 Sep 2015 00:20:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5CCF340693 for ; Sun, 20 Sep 2015 00:20:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B653183 for ; Sun, 20 Sep 2015 00:20:03 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1442708327.6c227bc298a62e2fcaec2a5530af121943b13240.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/actions.py pym/repoman/main.py X-VCS-Directories: pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 6c227bc298a62e2fcaec2a5530af121943b13240 X-VCS-Branch: repoman Date: Sun, 20 Sep 2015 00:20:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8e0ee68f-8e44-485d-894a-896a4d8effc0 X-Archives-Hash: 89293b132cd21c2b6324f6f517e2122a commit: 6c227bc298a62e2fcaec2a5530af121943b13240 Author: Brian Dolbec gentoo org> AuthorDate: Sun Sep 20 00:18:47 2015 +0000 Commit: Brian Dolbec gentoo 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)