Skip to contentSkip to conversation

recipeutils: fix NameError for recipes with unreliable upstream checks

PATCH New Prasanth R 1 participant 3 messages Nov 21

lore
Share & tools
lore

Prasanth R

author
#0 lore raw

PATCH 1/3 recipeutils: fix NameError for recipes with unreliable upstream checks

Since b1d01911fa ("lib/oe/reciputils.py: parallelize upstream version checks") pn is no longer set in get_recipe_upgrade_status(), so a recipe with UPSTREAM_CHECK_UNRELIABLE = "1" makes devtool check-upgrade-status fail with:

NameError: name 'pn' is not defined

Take the name from the recipe data instead.

AI-Generated: Uses Claude

---
 meta/lib/oe/recipeutils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/recipeutils.py +1 -1
index 522537e0d9..9b3a2d0638 100644
@@ -1186,7 +1186,7 @@ def get_recipe_upgrade_status(recipes=None, stable_upgrade=False):
 
             unreliable = data.getVar('UPSTREAM_CHECK_UNRELIABLE')
             if unreliable == "1":
-                bb.note(" Skip package %s as upstream check unreliable" % pn)
+                bb.note(" Skip package %s as upstream check unreliable" % data.getVar('PN'))
                 continue
 
             data_copy = bb.data.init()
Signature · 1 line
2.43.0
author
#1 lore raw

PATCH 2/3 resulttool: fix NameError in filter_resultsdata()

filter_resultsdata() takes resultid but compares against resultsid, so resulttool regression with --base-result-id or --target-result-id fails with:

NameError: name 'resultsid' is not defined

Use the parameter name.

AI-Generated: Uses Claude

---
 scripts/lib/resulttool/resultutils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/resulttool/resultutils.py +1 -1
index 53980f8007..13321a75f0 100644
@@ -119,7 +119,7 @@ def filter_resultsdata(results, resultid):
     newresults = {}
     for r in results:
         for i in results[r]:
-            if i == resultsid:
+            if i == resultid:
                  newresults[r] = {}
                  newresults[r][i] = results[r][i]
     return newresults
Signature · 1 line
2.43.0
author
#2 lore raw

PATCH 3/3 oeqa/qemutinyrunner: fix NameError when RUNQEMU_TMPFS_DIR is set

In reply to Prasanth R

QemuTinyRunner.start() sets RUNQEMU_TMPFS_DIR in env, which only exists in QemuRunner.start(). With RUNQEMU_TMPFS_DIR set, testimage on poky-tiny fails with:

NameError: name 'env' is not defined

Use os.environ, like the other variables set in this function.

AI-Generated: Uses Claude

---
 meta/lib/oeqa/utils/qemutinyrunner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/utils/qemutinyrunner.py +1 -1
index 0510977e9d..917bafdeaf 100644
@@ -86,7 +86,7 @@ class QemuTinyRunner(QemuRunner):
         else:
             os.environ["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image
         if self.tmpfsdir:
-            env["RUNQEMU_TMPFS_DIR"] = self.tmpfsdir
+            os.environ["RUNQEMU_TMPFS_DIR"] = self.tmpfsdir
 
 
         # Set this flag so that Qemu doesn't do any grabs as SDL grabs interact
Signature · 1 line
2.43.0