From f45f2506bdad14cfbe212692414c14475597590e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Tue, 12 Nov 2019 11:12:43 +0100 Subject: [PATCH] Fixed changelog reference commit An old reference commit was used which has to be updated because a manual change to the .changes file on obs was done :( --- helper/update_changelog.py | 7 +++++-- package/suse-migration-sle15-activation.changes.ref | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/helper/update_changelog.py b/helper/update_changelog.py index 53bb6fdd..1340622b 100755 --- a/helper/update_changelog.py +++ b/helper/update_changelog.py @@ -86,6 +86,9 @@ log_lines = gitlog.readlines() if arguments['--since']: + # append empty commit to prevent loosing log data if + # only one commit of change was found + log_lines.append(b'commit') # Iterate over log data and convert to changelog format for line_data in log_lines: line = line_data.decode(encoding='utf-8') @@ -131,11 +134,11 @@ for author_date in reversed(sorted(log_data.keys())): if date_reference: if date_reference < author_date: - sys.stdout.write(log_data[author_date]) + sys.stdout.write(log_data[author_date] + os.linesep) else: skip_list.append(author_date) else: - sys.stdout.write(log_data[author_date]) + sys.stdout.write(log_data[author_date] + os.linesep) else: for line_data in log_lines: line = line_data.decode(encoding='utf-8') diff --git a/package/suse-migration-sle15-activation.changes.ref b/package/suse-migration-sle15-activation.changes.ref index a71a68ef..d63b9da7 100644 --- a/package/suse-migration-sle15-activation.changes.ref +++ b/package/suse-migration-sle15-activation.changes.ref @@ -1,9 +1,9 @@ -commit cc3f0b43dabc45166559953c037dc1fa68ec40af -Author: Marcus Schäfer -AuthorDate: Thu May 2 15:14:31 2019 +0200 -Commit: Marcus Schäfer -CommitDate: Thu May 2 15:14:31 2019 +0200 +commit 9c1d0f22bfe3e74975fe76a50b8029d5a7325a52 +Author: Jesus Bermudez Velazquez +AuthorDate: Tue Aug 20 11:39:04 2019 +0100 +Commit: Jesus Bermudez Velazquez +CommitDate: Tue Aug 20 11:39:04 2019 +0100 Reference commit for SUSE maintenance - This submission creates a reference to fate#327175 and bsc#1133919 + Fix BYOS upgrade from 12SP4-SAP to 15 (BSC#1142108)