From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id B84B3388A43A; Mon, 24 May 2021 07:19:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B84B3388A43A MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1010] gcc-changelog: Add note about ChangeLog entries X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: dc084c487e997e7f47cee55467628ade4488538b X-Git-Newrev: 9d38e096c5e3b1c2233b28d0e6ff8ee81517af56 Message-Id: <20210524071920.B84B3388A43A@sourceware.org> Date: Mon, 24 May 2021 07:19:20 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2021 07:19:20 -0000 https://gcc.gnu.org/g:9d38e096c5e3b1c2233b28d0e6ff8ee81517af56 commit r12-1010-g9d38e096c5e3b1c2233b28d0e6ff8ee81517af56 Author: Martin Liska Date: Mon May 24 09:16:01 2021 +0200 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. Diff: --- 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')