@@ -12,8 +12,7 @@ class LicFilesChkSum(base.Metadata):
metadata = 'LIC_FILES_CHKSUM'
license = 'LICENSE'
closed = 'CLOSED'
- lictag = 'License-Update'
- lictag_re = pyparsing.Regex("^%s:" % lictag)
+ lictag_re = pyparsing.AtLineStart("License-Update:")
def test_lic_files_chksum_presence(self):
if not self.added:
@@ -71,5 +70,5 @@ class LicFilesChkSum(base.Metadata):
if self.lictag_re.search_string(commit.commit_message):
break
else:
- self.fail('LIC_FILES_CHKSUM changed on target %s but there is no "%s" tag in commit message. Include it with a brief description' % (pn, self.lictag),
+ self.fail('LIC_FILES_CHKSUM changed on target %s but there is no "License-Update:" tag in commit message. Include it with a brief description' % pn,
data=[('Current checksum', pretest), ('New checksum', test)])
the test_lic_files_chksum_modified_not_mentioned test in patchtest wasn't picking up on 'License-Update:' tags correctly. Use pyparsing's AtLineStart class to simplify the regex setup and search. Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> --- meta/lib/patchtest/tests/test_metadata_lic_files_chksum.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)