From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 3 Oct 2010 08:10:16 +0000 (+0200)
Subject: egencache --update-changelogs: strip leading CP from the log messages.
X-Git-Tag: v2.2_rc90~44
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=31bec2832a5f42b50c2998ebbe282d3456934c05;p=portage.git

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

diff --git a/bin/egencache b/bin/egencache
index 48350e713..7c3d9a245 100755
--- 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]))