From a1b56ac31f248129192287ddf1eb32fe0218a7b7 Mon Sep 17 00:00:00 2001 From: Krytarik Raido Date: Wed, 17 Mar 2021 00:45:04 +0100 Subject: [PATCH] merge-changelog: Fix setting of newlines. Signed-off-by: Mattia Rizzolo --- debian/changelog | 3 +++ merge-changelog | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0837626..c0fbe44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ ubuntu-dev-tools (0.185) UNRELEASED; urgency=medium + Fix crash due to PersonalPackageArchiveSourcePackage() returning the wrong object when requesting a download url. LP: #1938659 + [ Krytarik Raido ] + * merge-changelog: Fix setting of newlines. + -- Mattia Rizzolo Wed, 04 Aug 2021 11:59:05 +0200 ubuntu-dev-tools (0.184) experimental; urgency=medium diff --git a/merge-changelog b/merge-changelog index d808dbf..6dd245c 100755 --- a/merge-changelog +++ b/merge-changelog @@ -54,7 +54,10 @@ def merge_changelog(left_changelog, right_changelog): left_blocks = iter(left_cl) right_blocks = iter(right_cl) - for version in sorted(left_versions | right_versions, reverse=True): + clist = sorted(left_versions | right_versions, reverse=True) + ci = len(clist) + for version in clist: + ci -= 1 if version in left_versions: block = next(left_blocks) if version in right_versions: @@ -64,7 +67,7 @@ def merge_changelog(left_changelog, right_changelog): assert block.version == version - Logger.info(str(block).strip() + '\n\n') + Logger.info(str(block).strip() + ('\n' if ci else '')) def main():