[PATCH 0/1] Correct blacklist-related build errors

[PATCH 0/1] Correct blacklist-related build errors

[Peter Seebach]

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(-)

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

[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.

Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
---
 meta/classes/base.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 840ddbc..acc3217 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -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)
-- 
1.7.0.4

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

[Richard Purdie]

On Thu, 2012-08-16 at 11:50 -0500, Peter Seebach wrote:
> 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.
> 
> Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
> ---
>  meta/classes/base.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index 840ddbc..acc3217 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -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