On 5/23/21 2:37 PM, Tobias Burnus wrote:
As there was some confusion regarding when the ChangeLog is generated, I propose the attached wwwdocs patch. Comments?
I support the change. Moreover, I'm going to install the following patch that adds a note about ChangeLog entries. Martin
(Side remark: The cron-script commit by gccadmin@ is labelled "Daily bump." and updates gcc/DATESTAMP besides the ChangeLog files.) Tobias ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstrasse 201, 80634 München Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Frank Thürauf
>From 7a8e19e68c9c73ce18aeea02fc7e82fd4326a5a2 Mon Sep 17 00:00:00 2001 From: Martin Liska <mli...@suse.cz> Date: Mon, 24 May 2021 09:16:01 +0200 Subject: [PATCH] gcc-changelog: Add note about ChangeLog entries contrib/ChangeLog: * gcc-changelog/git_commit.py: Add note that ChangeLog entries are added automatically. * gcc-changelog/test_email.py: Update test. --- contrib/gcc-changelog/git_commit.py | 8 +++++--- contrib/gcc-changelog/test_email.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index 4958ab9c159..bd8c1ff7af2 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -326,9 +326,11 @@ class GitCommit: # All modified files are only MISC files return elif project_files: - self.errors.append(Error('ChangeLog, DATESTAMP, BASE-VER and ' - 'DEV-PHASE updates should be done ' - 'separately from normal commits')) + err = 'ChangeLog, DATESTAMP, BASE-VER and DEV-PHASE updates ' \ + 'should be done separately from normal commits\n' \ + '(note: ChangeLog entries will be automatically ' \ + 'added by a cron job)' + self.errors.append(Error(err)) return all_are_ignored = (len(project_files) + len(ignored_files) diff --git a/contrib/gcc-changelog/test_email.py b/contrib/gcc-changelog/test_email.py index 7472762e66d..6d6596370c4 100755 --- a/contrib/gcc-changelog/test_email.py +++ b/contrib/gcc-changelog/test_email.py @@ -258,7 +258,7 @@ class TestGccChangelog(unittest.TestCase): email = self.from_patch_glob('0001-Add-patch_are') msg = 'ChangeLog, DATESTAMP, BASE-VER and DEV-PHASE updates should ' \ 'be done separately from normal commits' - assert email.errors[0].message == msg + assert email.errors[0].message.startswith(msg) def test_strict_mode_normal_patch(self): email = self.get_git_email('0001-Just-test-it.patch') -- 2.31.1