summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-30 13:38:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-30 14:07:47 +0100
commitaf3c8928a69f204d5ced02c947485990ac04a776 (patch)
tree8fa6b92caffb0ae582162043842567930f77306f
parent8a60106c6f7d586c793b965c5e9460b6016fab15 (diff)
downloadbitbake-contrib-af3c8928a69f204d5ced02c947485990ac04a776.tar.gz
bitbake-contrib-af3c8928a69f204d5ced02c947485990ac04a776.tar.bz2
bitbake-contrib-af3c8928a69f204d5ced02c947485990ac04a776.zip
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/command.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bb/command.py b/lib/bb/command.py
index a9232455cc..0d0354c30f 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: