From 082a4170aca8e71cb56ae880e37bc62be6876d18 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 3 Apr 2014 11:16:24 +0100 Subject: bitbake: toaster: fix mis-detection of targets as images 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.) (Bitbake rev: b05e741cb5fe44b37538f2b727782f80dc9bb8fa) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/buildinfohelper.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 2a9e0981c7..e4d2f1f5a4 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/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: -- cgit v1.2.3-54-g00ecf