lib/oe/qa: remove obsolete "Accepted" string for Upstream-Status

Replaced by "Backport" since release 3.2
https://docs.yoctoproject.org/migration-guides/migration-3.2.html#miscellaneous-changes

Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index de980638c444a9816c8a7a528ad2b12dbbb56546..94955f78ba643264e792f4b00b743361d9a18ccc 100644 (file)
--- 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 511b36d0334470dc5301138cdadc14e8d7ae88f8..d63567efbe15efe2d3857895d50d3bbea8b671f5 100644 (file)
--- 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]