diff options
-rw-r--r-- | meta/lib/oe/qa.py | 2 | ||||
-rw-r--r-- | meta/lib/patchtest/tests/pyparsing/parse_upstream_status.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py index de980638c4..94955f78ba 100644 --- a/meta/lib/oe/qa.py +++ b/meta/lib/oe/qa.py | |||
@@ -216,7 +216,7 @@ def exit_if_errors(d): | |||
216 | def check_upstream_status(fullpath): | 216 | def check_upstream_status(fullpath): |
217 | import re | 217 | import re |
218 | kinda_status_re = re.compile(r"^.*upstream.*status.*$", re.IGNORECASE | re.MULTILINE) | 218 | kinda_status_re = re.compile(r"^.*upstream.*status.*$", re.IGNORECASE | re.MULTILINE) |
219 | strict_status_re = re.compile(r"^Upstream-Status: (Pending|Submitted|Denied|Accepted|Inappropriate|Backport|Inactive-Upstream)( .+)?$", re.MULTILINE) | 219 | strict_status_re = re.compile(r"^Upstream-Status: (Pending|Submitted|Denied|Inappropriate|Backport|Inactive-Upstream)( .+)?$", re.MULTILINE) |
220 | guidelines = "https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status" | 220 | guidelines = "https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status" |
221 | 221 | ||
222 | with open(fullpath, encoding='utf-8', errors='ignore') as f: | 222 | with open(fullpath, encoding='utf-8', errors='ignore') as f: |
diff --git a/meta/lib/patchtest/tests/pyparsing/parse_upstream_status.py b/meta/lib/patchtest/tests/pyparsing/parse_upstream_status.py index 511b36d033..d63567efbe 100644 --- a/meta/lib/patchtest/tests/pyparsing/parse_upstream_status.py +++ b/meta/lib/patchtest/tests/pyparsing/parse_upstream_status.py | |||
@@ -8,8 +8,8 @@ | |||
8 | import common | 8 | import common |
9 | import pyparsing | 9 | import pyparsing |
10 | 10 | ||
11 | upstream_status_literal_valid_status = ["Pending", "Accepted", "Backport", "Denied", "Inappropriate", "Submitted"] | 11 | upstream_status_literal_valid_status = ["Pending", "Backport", "Denied", "Inappropriate", "Submitted"] |
12 | upstream_status_nonliteral_valid_status = ["Pending", "Accepted", "Backport", "Denied", "Inappropriate [reason]", "Submitted [where]"] | 12 | upstream_status_nonliteral_valid_status = ["Pending", "Backport", "Denied", "Inappropriate [reason]", "Submitted [where]"] |
13 | 13 | ||
14 | upstream_status_valid_status = pyparsing.Or( | 14 | upstream_status_valid_status = pyparsing.Or( |
15 | [pyparsing.Literal(status) for status in upstream_status_literal_valid_status] | 15 | [pyparsing.Literal(status) for status in upstream_status_literal_valid_status] |