[YOCTO #15940]
Detect cases where Upstream-Status is placed after the patch
scissors ("---") and emit a warning instead of failing.
Such placement may be intentional in some workflows to avoid
including the tag in upstream commits.
v3:
- Fix indentation issues from previous version
- Keep changes minimal and avoid unrelated formatting changes
- Retain intended warning behavior
Signed-off-by: Aditya GS <[email protected]>
---
meta/lib/patchtest/tests/test_patch.py | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/meta/lib/patchtest/tests/test_patch.py
b/meta/lib/patchtest/tests/test_patch.py
index 3b33b5a199..598a2234aa 100644
--- a/meta/lib/patchtest/tests/test_patch.py
+++ b/meta/lib/patchtest/tests/test_patch.py
@@ -67,13 +67,10 @@ class TestPatch(base.Base):
if not header_has_upstream:
if body_has_upstream:
- self.fail(
- 'Upstream-Status is present only after the patch
scissors. '
- "It must be placed in the patch header before the
scissors line.",
- data=[
- ("Standard format", self.standard_format),
- ("Valid status", self.valid_status),
- ],
+ print(
+ "WARNING: Upstream-Status is present only after the
patch scissors. "
+ "It may be ignored by git and lost during patch
refresh. "
+ "Consider placing it before the scissors line."
)
else:
self.fail(
@@ -92,15 +89,12 @@ class TestPatch(base.Base):
continue
if scissors_index is not None and idx > scissors_index:
- self.fail(
- 'Upstream-Status must be placed in the patch header
before the scissors line, '
- "but was found afterwards.",
- data=[
- ("Current", line.lstrip("+")),
- ("Standard format", self.standard_format),
- ("Valid status", self.valid_status),
- ],
+ print(
+ "WARNING: Upstream-Status found after patch scissors. "
+ "It may be ignored by git and lost during patch
refresh. "
+ "Consider placing it before the scissors line."
)
+ continue
if patchtest_patterns.inappropriate.searchString(line):
try:
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#238448):
https://lists.openembedded.org/g/openembedded-core/message/238448
Mute This Topic: https://lists.openembedded.org/mt/119759400/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
