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(-) 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): 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: 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 @@ 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] -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#187991): https://lists.openembedded.org/g/openembedded-core/message/187991 Mute This Topic: https://lists.openembedded.org/mt/101498745/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
