Skip to contentSkip to conversation

Correct blacklist-related build errors

PATCH Applied Peter Seebach 2 participants 3 messages Aug 16, 2012 – Aug 17, 2012

lore
Share & tools
lore
#0 lore raw

cover Correct blacklist-related build errors

The fallback "or []" for the case where there are no PNBLACKLIST entries was of the wrong type; it should be {}.

The following changes since commit 24babf9316da50c8a4d2f328c4336cb8cd6cf667:
Paul Eggleton (1):
classes/chrpath: trigger an error if chrpath fails

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib seebs/cleanup
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=seebs/cleanup

Peter Seebach (1):
base.bbclass: Work even when there's no PNBLACKLIST entries

 meta/classes/base.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
#1 lore raw

PATCH 1/1 base.bbclass: Work even when there's no PNBLACKLIST entries

It turns out that the result of getVarFlags is not a list, it's a dict. So "getVarFlags(...) or []" does not reliably produce something with a .items. This escaped detection because our local build environment never ends up running builds without PNBLACKLIST entries.

---
 meta/classes/base.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/base.bbclass +1 -1
index 840ddbc..acc3217 100644
@@ -175,7 +175,7 @@ def preferred_ml_updates(d):
 
     versions = []
     providers = []
-    blacklists = d.getVarFlags('PNBLACKLIST') or []
+    blacklists = d.getVarFlags('PNBLACKLIST') or {}
     for v in d.keys():
         if v.startswith("PREFERRED_VERSION_"):
             versions.append(v)
Signature · 1 line
1.7.0.4
#2 lore raw

Re: [PATCH 1/1] base.bbclass: Work even when there's no PNBLACKLIST entries

Quoted 16 lines · Peter Seebach

It turns out that the result of getVarFlags is not a list, it's a dict. So "getVarFlags(...) or []" does not reliably produce something with a .items. This escaped detection because our local build environment never ends up running builds without PNBLACKLIST entries.

---
 meta/classes/base.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/base.bbclass +0 -0
index 840ddbc..acc3217 100644

meta/classes/base.bbclass def preferred_ml_updates(d): · line 181

Quoted 8 lines
meta/classes/base.bbclass +1 -1
@@ -175,7 +175,7 @@ def preferred_ml_updates(d):
 
     versions = []
     providers = []
-    blacklists = d.getVarFlags('PNBLACKLIST') or []
+    blacklists = d.getVarFlags('PNBLACKLIST') or {}
     for v in d.keys():
         if v.startswith("PREFERRED_VERSION_"):
             versions.append(v)

Merged to master, thanks.

Richard