From 27edc7c1a906e38376054ad2a362ae213a45ba1b Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 22 Jul 2011 17:03:55 +0100 Subject: bitbake-layers: check for errors before parsing Don't always parse on initialisation - instead check for errors and then parse when we know we need to. Avoids keeping the user waiting. (Bitbake rev: 86adaca6ce959ad5e908c394625bc9880f3c0216) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/bin/bitbake-layers | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'bitbake/bin') diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index 1c48c8c92d..56253f5d28 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers @@ -48,7 +48,7 @@ class Commands(cmd.Cmd): self.register_idle_function) self.config_data = self.cooker.configuration.data bb.providers.logger.setLevel(logging.ERROR) - self.prepare_cooker() + self.cooker_data = None def register_idle_function(self, function, data): pass @@ -71,10 +71,16 @@ class Commands(cmd.Cmd): self.cooker_data = self.cooker.status self.cooker_data.appends = self.cooker.appendlist + def check_prepare_cooker(self): + if not self.cooker_data: + self.prepare_cooker() + def do_show_layers(self, args): + self.check_prepare_cooker() logger.info(str(self.config_data.getVar('BBLAYERS', True))) def do_show_overlayed(self, args): + self.check_prepare_cooker() if self.cooker.overlayed: logger.info('Overlayed recipes:') for f in self.cooker.overlayed.iterkeys(): @@ -94,6 +100,7 @@ class Commands(cmd.Cmd): logger.error('Directory %s exists and is non-empty, please clear it out first' % arglist[0]) return + self.check_prepare_cooker() layers = (self.config_data.getVar('BBLAYERS', True) or "").split() for layer in layers: overlayed = [] @@ -143,6 +150,7 @@ class Commands(cmd.Cmd): recipefile.writelines(appendfile.readlines()) def do_show_appends(self, args): + self.check_prepare_cooker() if not self.cooker_data.appends: logger.info('No append files found') return -- cgit v1.2.3-54-g00ecf