[Toaster] [PATCH 2/2] toaster: fix mis-detection of targets as images
Paul Eggleton
paul.eggleton at linux.intel.com
Fri Apr 4 07:02:50 PDT 2014
If you are using the testimage class then the old test mistook the
global inheritance of testimage.bbclass with the recipe inheriting
image.bbclass because it was only looking for that at the end of the
string.
Also tidy up the code so you an easily tell what it's doing. (The
original method may have been more "pythonic", but it does nothing for
readability.)
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---
lib/bb/ui/buildinfohelper.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py
index 2a9e098..e4d2f1f 100644
--- a/lib/bb/ui/buildinfohelper.py
+++ b/lib/bb/ui/buildinfohelper.py
@@ -845,10 +845,12 @@ class BuildInfoHelper(object):
recipe_info['bugtracker'] = event._depgraph['pn'][pn]['bugtracker']
recipe_info['file_path'] = file_name
recipe = self.orm_wrapper.get_update_recipe_object(recipe_info)
+ recipe.is_image = False
if 'inherits' in event._depgraph['pn'][pn].keys():
- recipe.is_image = True in map(lambda x: x.endswith('image.bbclass'), event._depgraph['pn'][pn]['inherits'])
- else:
- recipe.is_image = False
+ for cls in event._depgraph['pn'][pn]['inherits']:
+ if cls.endswith('/image.bbclass'):
+ recipe.is_image = True
+ break
if recipe.is_image:
for t in self.internal_state['targets']:
if pn == t.target:
--
1.9.0
More information about the toaster
mailing list