commit: 3aa9b7ad3e12d0c4b1177d6a52a02ae14edff3d5
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 22:28:47 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 19:36:09 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3aa9b7ad
repoman: Update man page and commitmsgfile option
Use .lower() on the leading 9 characters of the message text for the
substitution
test.
Update the man page for this new templating capability.
repoman/man/repoman.1 | 6 +++++-
repoman/pym/repoman/actions.py | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/repoman/man/repoman.1 b/repoman/man/repoman.1
index 4a9122e..8df3207 100644
--- a/repoman/man/repoman.1
+++ b/repoman/man/repoman.1
@@ -109,7 +109,11 @@ Behave as if no package.mask entries exist (not allowed
with commit mode)
Adds a commit message via the command line
.TP
\fB-M\fR, \fB--commitmsgfile\fR
-Adds a commit message from the specified file
+Adds a commit message from the specified file. This option also will perform
+an automatic text substitution of a leading "cat/pkg: " string (upper or lower
+case) with the actual category/package prefix as defined by the required
message
+format. Use this option for templating a common commit message for multiple
+package updates.
.TP
\fB-V\fR, \fB--version\fR
Show version info
diff --git a/repoman/pym/repoman/actions.py b/repoman/pym/repoman/actions.py
index 0534c29..796dbaf 100644
--- a/repoman/pym/repoman/actions.py
+++ b/repoman/pym/repoman/actions.py
@@ -108,7 +108,7 @@ class Actions(object):
" --commitmsgfile='%s'\n" %
self.options.commitmsgfile)
else:
raise
- if commitmessage[:9] in ("cat/pkg: ", "CAT/PKG: "):
+ if commitmessage[:9].lower() in ("cat/pkg: ",):
commitmessage = self.msg_prefix() +
commitmessage[9:]
if not commitmessage or not commitmessage.strip():
