From af3c8928a69f204d5ced02c947485990ac04a776 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 30 Aug 2017 13:38:42 +0100 Subject: command: Fix some bugs identified by BB_SERVER_TIMEOUT The 'needconfig' flag was meant to be the default as most commands do need it and the "False" cases were the exception. The code was written backwards with a default False value. Invert this to match the intent, resulting in the config being reparsed if metadata has changed. Also ensure the second level configuration is parsed for the getLayerPriorities command as otherwise it can return stale info. With these changes: BB_SERVER_TIMEOUT=100 oe-selftest -r bblayers.BitbakeLayers.test_bitbakelayers_add_remove passes instead of fails. Signed-off-by: Richard Purdie --- lib/bb/command.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bb/command.py b/lib/bb/command.py index a9232455c..0d0354c30 100644 --- a/lib/bb/command.py +++ b/lib/bb/command.py @@ -79,7 +79,7 @@ class Command: return None, "Not able to execute not readonly commands in readonly mode" try: self.cooker.process_inotify_updates() - if getattr(command_method, 'needconfig', False): + if getattr(command_method, 'needconfig', True): self.cooker.updateCacheSync() result = command_method(self, commandline) except CommandError as exc: @@ -283,6 +283,7 @@ class CommandsSync: parseConfiguration.needconfig = False def getLayerPriorities(self, command, params): + command.cooker.parseConfiguration() ret = [] # regex objects cannot be marshalled by xmlrpc for collection, pattern, regex, pri in command.cooker.bbfile_config_priorities: -- cgit 1.2.3-korg