From 9d38e096c5e3b1c2233b28d0e6ff8ee81517af56 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@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 4958ab9c1595..bd8c1ff7af22 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 7472762e66da..6d6596370c4b 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')
--
GitLab