diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2022-05-26 12:02:36 +0200 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-05-31 05:49:55 -1000 |
| commit | d96022a38908fbcf0583ed3388d5667bff38087b (patch) | |
| tree | 698cd2707e6732fa3f66184278fa2570037a0e9f /meta/classes | |
| parent | b34aaa9acbe865f61be0a598b8df2735b1bc76cd (diff) | |
| download | openembedded-core-contrib-d96022a38908fbcf0583ed3388d5667bff38087b.tar.gz | |
insane.bbclass: make sure to close .patch files
* fixes:
DEBUG: Executing python function do_qa_patch
/OE/build/oe-core/openembedded-core/meta/classes/insane.bbclass:1189: ResourceWarning: unclosed file <_io.TextIOWrapper name='/OE/build/oe-core/openembedded-core/meta/recipes-bsp/keymaps/files/GPLv2.patch' mode='r' encoding='utf-8'>
content = open(fullpath, encoding='utf-8', errors='ignore').read()
ResourceWarning: Enable tracemalloc to get the object allocation traceback
DEBUG: Python function do_qa_patch finished
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 61be3668d866834adfff688620aee7e29f6d8c44)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/insane.bbclass | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 0bc6492c83..9ca84bace9 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -1201,18 +1201,20 @@ python do_qa_patch() { if '/meta/' not in fullpath: continue - content = open(fullpath, encoding='utf-8', errors='ignore').read() kinda_status_re = re.compile(r"^.*upstream.*status.*$", re.IGNORECASE | re.MULTILINE) strict_status_re = re.compile(r"^Upstream-Status: (Pending|Submitted|Denied|Accepted|Inappropriate|Backport|Inactive-Upstream)( .+)?$", re.MULTILINE) - match_kinda = kinda_status_re.search(content) - match_strict = strict_status_re.search(content) guidelines = "https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status" - if not match_strict: - if match_kinda: - bb.error("Malformed Upstream-Status in patch\n%s\nPlease correct according to %s :\n%s" % (fullpath, guidelines, match_kinda.group(0))) - else: - bb.error("Missing Upstream-Status in patch\n%s\nPlease add according to %s ." % (fullpath, guidelines)) + with open(fullpath, encoding='utf-8', errors='ignore') as f: + file_content = f.read() + match_kinda = kinda_status_re.search(file_content) + match_strict = strict_status_re.search(file_content) + + if not match_strict: + if match_kinda: + bb.error("Malformed Upstream-Status in patch\n%s\nPlease correct according to %s :\n%s" % (fullpath, guidelines, match_kinda.group(0))) + else: + bb.error("Missing Upstream-Status in patch\n%s\nPlease add according to %s ." % (fullpath, guidelines)) } python do_qa_configure() { |