Patchwork [bitbake-devel] cooker: fix traceback when using -b with skipped recipe

login
register
mail settings
Submitter Paul Eggleton
Date Aug. 22, 2012, 3:14 p.m.
Message ID <1345648478-2678-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/35139/
State New
Headers show

Comments

Paul Eggleton - Aug. 22, 2012, 3:14 p.m.
If a recipe is skipped during parsing for whatever reason, check and
report this as an error rather than trying to use the data that is sent
back and failing.

Fixes [YOCTO #2976].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 bitbake/lib/bb/cooker.py |    4 ++++
 1 file changed, 4 insertions(+)
Richard Purdie - Aug. 23, 2012, 7:50 a.m.
On Wed, 2012-08-22 at 16:14 +0100, Paul Eggleton wrote:
> If a recipe is skipped during parsing for whatever reason, check and
> report this as an error rather than trying to use the data that is sent
> back and failing.
> 
> Fixes [YOCTO #2976].
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  bitbake/lib/bb/cooker.py |    4 ++++
>  1 file changed, 4 insertions(+)

Merged to master, thanks.

Richard

Patch

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 1737e54..a6b848e 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1060,6 +1060,10 @@  class BBCooker:
             info_array = infos[fn]
         except KeyError:
             bb.fatal("%s does not exist" % fn)
+
+        if info_array[0].skipped:
+            bb.fatal("%s was skipped: %s" % (fn, info_array[0].skipreason))
+
         self.status.add_from_recipeinfo(fn, info_array)
 
         # Tweak some variables