commit: 9311ffcfde2c6a8528ab3af23960cf995c614fa7 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Sat Sep 19 04:34:01 2015 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Sat Sep 19 04:34:01 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9311ffcf
repoman/actions.py: Split out get_new_commit_message() pym/repoman/actions.py | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index 97d3458..44b2c04 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -108,24 +108,8 @@ class Actions(object): else: raise if not commitmessage or not commitmessage.strip(): - msg_prefix = "" - if self.scanner.repolevel > 1: - msg_prefix = "/".join(self.scanner.reposplit[1:]) + ": " + commitmessage = self.get_new_commit_message(qa_output) - try: - editor = os.environ.get("EDITOR") - if editor and utilities.editor_is_executable(editor): - commitmessage = utilities.get_commit_message_with_editor( - editor, message=qa_output, prefix=msg_prefix) - else: - commitmessage = utilities.get_commit_message_with_stdin() - except KeyboardInterrupt: - logging.fatal("Interrupted; exiting...") - sys.exit(1) - if (not commitmessage or not commitmessage.strip() - or commitmessage.strip() == msg_prefix): - print("* no commit message? aborting commit.") - sys.exit(1) commitmessage = commitmessage.rstrip() myupdates, broken_changelog_manifests = self.changelogs( @@ -822,3 +806,24 @@ class Actions(object): portage.writemsg("!!! Disabled FEATURES='sign'\n") self.repo_settings.sign_manifests = False + + def get_new_commit_message(self, qa_output): + msg_prefix = "" + if self.scanner.repolevel > 1: + msg_prefix = "/".join(self.scanner.reposplit[1:]) + ": " + + try: + editor = os.environ.get("EDITOR") + if editor and utilities.editor_is_executable(editor): + commitmessage = utilities.get_commit_message_with_editor( + editor, message=qa_output, prefix=msg_prefix) + else: + commitmessage = utilities.get_commit_message_with_stdin() + except KeyboardInterrupt: + logging.fatal("Interrupted; exiting...") + sys.exit(1) + if (not commitmessage or not commitmessage.strip() + or commitmessage.strip() == msg_prefix): + print("* no commit message? aborting commit.") + sys.exit(1) + return commitmessage