From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 3 Oct 2010 08:34:51 +0000 (+0200)
Subject: egencache --update-changelogs: don't break change list on hyphens.
X-Git-Tag: v2.1.9.14~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9192f2238d26ce0d6099c5185cfae73ebb214c3e;p=portage.git

egencache --update-changelogs: don't break change list on hyphens.
---

diff --git a/bin/egencache b/bin/egencache
index 7c3d9a245..cc83f9fd1 100755
--- a/bin/egencache
+++ b/bin/egencache
@@ -568,8 +568,12 @@ class GenChangeLogs(object):
 			# 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]))
+			# don't break filenames on hyphens
+			self._wrapper.break_on_hyphens = False
+			output.write(self._wrapper.fill('%s; %s %s:' % (date, author, ', '.join(changed))))
+			# but feel free to break commit messages there
+			self._wrapper.break_on_hyphens = True
+			output.write('\n'.join([''] + [self._wrapper.fill(x) for x in body]))
 
 		output.close()