From 74df7c8e80bac7b44f148fbd702e523982698fdf Mon Sep 17 00:00:00 2001 From: Bogdano Arendartchuk Date: Mon, 3 Mar 2008 21:11:21 +0000 Subject: Ensure sorted changelog entries will have correct spacing Strip the spare changelog entries newlines in order to add again later and ensure that we will have the same spacing between all sorted changelog entries. --- RepSys/log.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'RepSys/log.py') diff --git a/RepSys/log.py b/RepSys/log.py index 217a996..2eadbe2 100644 --- a/RepSys/log.py +++ b/RepSys/log.py @@ -469,10 +469,18 @@ def svn2rpm(pkgdirurl, rev=None, size=None, submit=False, def _split_changelog(stream): current = None count = 0 + def finish(entry): + lines = entry[2] + # strip newlines at the end + for i in xrange(len(lines)-1, -1, -1): + if lines[i] != "\n": + break + del lines[i] + return entry for line in stream: if line.startswith("*"): if current: - yield current + yield finish(current) fields = line.split() rawdate = " ".join(fields[:5]) try: @@ -490,13 +498,14 @@ def _split_changelog(stream): else: pass # not good, but ignore if current: - yield current + yield finish(current) def sort_changelog(stream): entries = _split_changelog(stream) log = StringIO() for time, count, elines in sorted(entries, reverse=True): log.writelines(elines) + log.write("\n") return log def split_spec_changelog(stream): -- cgit v1.2.1