From dc15ddd1613035e3f7cf19556d9b7e6b025c7702 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 1 Jun 2011 17:48:32 +0100 Subject: bitbake-layers: handle skipped recipes Report bbappends correctly for skipped recipes instead of reporting the bbappends as not having any matching recipe. (From Poky rev: 39d72ecf6bc1da85aefb11e6481719185f0cb953) (Bitbake rev: a71183762e5d7d9f8153832efb9595e3a21d62f1) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/bin/bitbake-layers | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'bitbake/bin/bitbake-layers') diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index d2ed5d49ca..6b5ad5a38b 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers @@ -83,6 +83,8 @@ class Commands(cmd.Cmd): for pn in self.cooker_data.pkg_pn: self.show_appends_for_pn(pn) + self.show_appends_for_skipped() + self.show_appends_with_no_recipes() def show_appends_for_pn(self, pn): @@ -94,17 +96,27 @@ class Commands(cmd.Cmd): self.cooker_data.pkg_pn) best_filename = os.path.basename(best[3]) + self.show_appends_output(filenames, best_filename) + + def show_appends_for_skipped(self): + filenames = [os.path.basename(f) + for f in self.cooker.skiplist.iterkeys()] + self.show_appends_output(filenames, None, " (skipped)") + + def show_appends_output(self, filenames, best_filename, name_suffix = ''): appended, missing = self.get_appends_for_files(filenames) if appended: for basename, appends in appended: - logger.info('%s:', basename) + logger.info('%s%s:', basename, name_suffix) for append in appends: logger.info(' %s', append) - if best_filename in missing: - logger.warn('%s: missing append for preferred version', - best_filename) - self.returncode |= 1 + if best_filename: + if best_filename in missing: + logger.warn('%s: missing append for preferred version', + best_filename) + self.returncode |= 1 + def get_appends_for_files(self, filenames): appended, notappended = set(), set() @@ -124,6 +136,8 @@ class Commands(cmd.Cmd): def show_appends_with_no_recipes(self): recipes = set(os.path.basename(f) for f in self.cooker_data.pkg_fn.iterkeys()) + recipes |= set(os.path.basename(f) + for f in self.cooker.skiplist.iterkeys()) appended_recipes = self.cooker_data.appends.iterkeys() appends_without_recipes = [self.cooker_data.appends[recipe] for recipe in appended_recipes -- cgit v1.2.3-54-g00ecf