Skip to contentSkip to conversation

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

PATCH New [email protected] 1 participant 2 messages Sep 21, 2023

lore
Share & tools
lore
#0 lore raw

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

---
 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
index de980638c4..94955f78ba 100644
@@ -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
index 511b36d033..d63567efbe 100644
@@ -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
#1 lore raw

PATCH 2/2 lib/oe/qa: update guidelines link for Upstream-Status

From: Michael Opdenacker <[email protected]>

---
 meta/lib/oe/qa.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/qa.py +1 -1
index 94955f78ba..f8ae3c743f 100644
@@ -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