summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2010-10-03 10:34:51 +0200
committerZac Medico <zmedico@gentoo.org>2010-10-06 15:50:36 -0700
commit9192f2238d26ce0d6099c5185cfae73ebb214c3e (patch)
tree26809ffbaf5382aa7f83c87376cd9dadf3a612e0
parenta43c6c8af6a3533ac98134c012ab92f16fec6b02 (diff)
downloadportage-9192f2238d26ce0d6099c5185cfae73ebb214c3e.tar.gz
portage-9192f2238d26ce0d6099c5185cfae73ebb214c3e.tar.bz2
portage-9192f2238d26ce0d6099c5185cfae73ebb214c3e.zip
egencache --update-changelogs: don't break change list on hyphens.
-rwxr-xr-xbin/egencache8
1 files changed, 6 insertions, 2 deletions
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()