@@ -1349,31 +1349,31 @@ python do_qa_patch() {
coremeta_path = os.path.join(d.getVar('COREBASE'), 'meta', '')
for url in patch.src_patches(d):
- (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url)
-
- # skip patches not in oe-core
- patchtype = "patch-status-core"
- if not os.path.abspath(fullpath).startswith(coremeta_path):
- patchtype = "patch-status-noncore"
- if not allpatches:
- continue
-
- 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)
- guidelines = "https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status"
-
- 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:
- msg = "Malformed Upstream-Status in patch\n%s\nPlease correct according to %s :\n%s" % (fullpath, guidelines, match_kinda.group(0))
- oe.qa.handle_error(patchtype, msg, d)
- else:
- msg = "Missing Upstream-Status in patch\n%s\nPlease add according to %s ." % (fullpath, guidelines)
- oe.qa.handle_error(patchtype, msg, d)
+ (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url)
+
+ # skip patches not in oe-core
+ patchtype = "patch-status-core"
+ if not os.path.abspath(fullpath).startswith(coremeta_path):
+ patchtype = "patch-status-noncore"
+ if not allpatches:
+ continue
+
+ 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)
+ guidelines = "https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status"
+
+ 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:
+ msg = "Malformed Upstream-Status in patch\n%s\nPlease correct according to %s :\n%s" % (fullpath, guidelines, match_kinda.group(0))
+ oe.qa.handle_error(patchtype, msg, d)
+ else:
+ msg = "Missing Upstream-Status in patch\n%s\nPlease add according to %s ." % (fullpath, guidelines)
+ oe.qa.handle_error(patchtype, msg, d)
oe.qa.exit_if_errors(d)
}
* this block was using just 3 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/classes-global/insane.bbclass | 50 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-)