lib/oe/qa: remove obsolete "Accepted" string for Upstream-Status
PATCH 1/2 lib/oe/qa: remove obsolete "Accepted" string for Upstream-Status
From: Michael Opdenacker <[email protected]>
Replaced by "Backport" since release 3.2
https://docs.yoctoproject.org/migration-guides/migration-3.2.html#miscellaneous-changes
Signed-off-by Michael Opdenacker <[email protected]>
--- meta/lib/oe/qa.py | 2 +- meta/lib/patchtest/tests/pyparsing/parse_upstream_status.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
meta/lib/oe/qa.py +1 -1
@@ -216,7 +216,7 @@ def exit_if_errors(d): def check_upstream_status(fullpath): import re 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) + strict_status_re = re.compile(r"^Upstream-Status: (Pending|Submitted|Denied|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:
meta/lib/patchtest/tests/pyparsing/parse_upstream_status.py +2 -2
@@ -8,8 +8,8 @@ import common import pyparsing -upstream_status_literal_valid_status = ["Pending", "Accepted", "Backport", "Denied", "Inappropriate", "Submitted"] -upstream_status_nonliteral_valid_status = ["Pending", "Accepted", "Backport", "Denied", "Inappropriate [reason]", "Submitted [where]"] +upstream_status_literal_valid_status = ["Pending", "Backport", "Denied", "Inappropriate", "Submitted"] +upstream_status_nonliteral_valid_status = ["Pending", "Backport", "Denied", "Inappropriate [reason]", "Submitted [where]"] upstream_status_valid_status = pyparsing.Or( [pyparsing.Literal(status) for status in upstream_status_literal_valid_status]
Signature · 1 line
2.34.1
PATCH 2/2 lib/oe/qa: update guidelines link for Upstream-Status
From: Michael Opdenacker <[email protected]>
Signed-off-by Michael Opdenacker <[email protected]>
--- meta/lib/oe/qa.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/qa.py +1 -1
@@ -217,7 +217,7 @@ def check_upstream_status(fullpath): import re kinda_status_re = re.compile(r"^.*upstream.*status.*$", re.IGNORECASE | re.MULTILINE) strict_status_re = re.compile(r"^Upstream-Status: (Pending|Submitted|Denied|Inappropriate|Backport|Inactive-Upstream)( .+)?$", re.MULTILINE) - guidelines = "https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status" + guidelines = "https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status" with open(fullpath, encoding='utf-8', errors='ignore') as f: file_content = f.read()
Signature · 1 line
2.34.1