egencache --update-changelogs: strip leading CP from the log messages.

diff --git a/bin/egencache b/bin/egencache
index 48350e7130b84d43737bad9a9dff2fde2002ff08..7c3d9a245fc6f6642da28c256206f6de8f37729e 100755 (executable)
--- a/bin/egencache
+++ b/bin/egencache
@@ -26,6 +26,7 @@ import optparse
 import subprocess
 import time
 import textwrap
+import re
 
 try:
        import portage
@@ -562,9 +563,11 @@ class GenChangeLogs(object):
                        if wroteheader:
                                output.write('\n')
 
-                       # XXX: strip '<CP>: ' and '[<CP>] ' from the commit message
                        # XXX: strip the repoman suffix note from the commit message
 
+                       # strip '<cp>: ', '[<cp>] ', and similar
+                       body[0] = re.sub(r'^\W*' + cp + '\W+', '', body[0])
+
                        body.insert(0, '%s; %s %s:' % (date, author, ', '.join(changed)))
                        output.write('\n'.join([self._wrapper.fill(x) for x in body]))