diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-02-15 18:20:39 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-19 07:47:53 +0000 |
| commit | c980c93c5df6747b6194cdb8df1f90aa9d31beb7 (patch) | |
| tree | eddafe097919f33bb9cedbafea8b857a0bde62b5 | |
| parent | 34c454c99aa9e2c07a631e649c6b749d77412c7e (diff) | |
| download | poky-c980c93c5df6747b6194cdb8df1f90aa9d31beb7.tar.gz | |
insane.bbclass: use 4 spaces for indentation
* this block was using just 3
(From OE-Core rev: 4578f2237cb694473eb54ff85af342ee94c9f19d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes-global/insane.bbclass | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index c48a2e39f9..4053eda094 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass | |||
| @@ -1348,31 +1348,31 @@ python do_qa_patch() { | |||
| 1348 | 1348 | ||
| 1349 | coremeta_path = os.path.join(d.getVar('COREBASE'), 'meta', '') | 1349 | coremeta_path = os.path.join(d.getVar('COREBASE'), 'meta', '') |
| 1350 | for url in patch.src_patches(d): | 1350 | for url in patch.src_patches(d): |
| 1351 | (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url) | 1351 | (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url) |
| 1352 | 1352 | ||
| 1353 | # skip patches not in oe-core | 1353 | # skip patches not in oe-core |
| 1354 | patchtype = "patch-status-core" | 1354 | patchtype = "patch-status-core" |
| 1355 | if not os.path.abspath(fullpath).startswith(coremeta_path): | 1355 | if not os.path.abspath(fullpath).startswith(coremeta_path): |
| 1356 | patchtype = "patch-status-noncore" | 1356 | patchtype = "patch-status-noncore" |
| 1357 | if not allpatches: | 1357 | if not allpatches: |
| 1358 | continue | 1358 | continue |
| 1359 | 1359 | ||
| 1360 | kinda_status_re = re.compile(r"^.*upstream.*status.*$", re.IGNORECASE | re.MULTILINE) | 1360 | kinda_status_re = re.compile(r"^.*upstream.*status.*$", re.IGNORECASE | re.MULTILINE) |
| 1361 | strict_status_re = re.compile(r"^Upstream-Status: (Pending|Submitted|Denied|Accepted|Inappropriate|Backport|Inactive-Upstream)( .+)?$", re.MULTILINE) | 1361 | strict_status_re = re.compile(r"^Upstream-Status: (Pending|Submitted|Denied|Accepted|Inappropriate|Backport|Inactive-Upstream)( .+)?$", re.MULTILINE) |
| 1362 | guidelines = "https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status" | 1362 | guidelines = "https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status" |
| 1363 | 1363 | ||
| 1364 | with open(fullpath, encoding='utf-8', errors='ignore') as f: | 1364 | with open(fullpath, encoding='utf-8', errors='ignore') as f: |
| 1365 | file_content = f.read() | 1365 | file_content = f.read() |
| 1366 | match_kinda = kinda_status_re.search(file_content) | 1366 | match_kinda = kinda_status_re.search(file_content) |
| 1367 | match_strict = strict_status_re.search(file_content) | 1367 | match_strict = strict_status_re.search(file_content) |
| 1368 | 1368 | ||
| 1369 | if not match_strict: | 1369 | if not match_strict: |
| 1370 | if match_kinda: | 1370 | if match_kinda: |
| 1371 | msg = "Malformed Upstream-Status in patch\n%s\nPlease correct according to %s :\n%s" % (fullpath, guidelines, match_kinda.group(0)) | 1371 | msg = "Malformed Upstream-Status in patch\n%s\nPlease correct according to %s :\n%s" % (fullpath, guidelines, match_kinda.group(0)) |
| 1372 | oe.qa.handle_error(patchtype, msg, d) | 1372 | oe.qa.handle_error(patchtype, msg, d) |
| 1373 | else: | 1373 | else: |
| 1374 | msg = "Missing Upstream-Status in patch\n%s\nPlease add according to %s ." % (fullpath, guidelines) | 1374 | msg = "Missing Upstream-Status in patch\n%s\nPlease add according to %s ." % (fullpath, guidelines) |
| 1375 | oe.qa.handle_error(patchtype, msg, d) | 1375 | oe.qa.handle_error(patchtype, msg, d) |
| 1376 | 1376 | ||
| 1377 | oe.qa.exit_if_errors(d) | 1377 | oe.qa.exit_if_errors(d) |
| 1378 | } | 1378 | } |
