]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
patchreview: use check_upstream_status() from oe.qa
authorMartin Jansa <Martin.Jansa@gmail.com>
Wed, 6 Nov 2024 14:54:49 +0000 (15:54 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 12 Nov 2024 11:19:42 +0000 (11:19 +0000)
* the idea was to reuse the same function as I've noticed that the
  QA check which was added to insane.bbclass in:
  https://git.openembedded.org/openembedded-core/commit/?id=76a685bfcf927593eac67157762a53259089ea8a
  is in some cases more strcit than scripts/contrib/patchreview.py

  To be honest I wasn't aware of scripts/contrib/patchreview.py
  existence when I've asked about moving check_upstream_status()
  to oe.qa in order to write standalone script just like
  patchreview.py

* I've sent this long time ago:
  https://lists.openembedded.org/g/openembedded-core/message/177207
  but didn't like the sys.path.append to find oe.qa much or the
  duplicated path to .patch file in the output, then I've forgot about
  it until today in https://github.com/OE4T/meta-tegra/pull/1749
  where checklayer found one more issue, which I haven't noticed
  with patchreview.py before (because I've accidentally used a version
  without this change). It's not perfect, but at least it will be
  consistent with checklayer and patch-status QA check.

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/contrib/patchreview.py

index bceae06561c48c87a6911a76a3314d7e8800ee05..69ef14eb44a32d1eccb74bd5acb86cb6a1efa243 100755 (executable)
@@ -14,6 +14,10 @@ import pathlib
 import re
 import subprocess
 
+import sys
+sys.path.append(os.path.join(sys.path[0], '../../meta/lib'))
+import oe.qa
+
 # TODO
 # - option to just list all broken files
 # - test suite
@@ -78,12 +82,11 @@ def patchreview(patches):
         else:
             result.missing_sob = True
 
-
         # Find the Upstream-Status tag
         match = status_re.search(content)
         if match:
-            value = match.group(1)
-            if value != "Upstream-Status:":
+            value = oe.qa.check_upstream_status(patch)
+            if value:
                 result.malformed_upstream_status = value
 
             value = match.group(2).lower()