From 6caa7d1d6c122d084ed01d1f5e1dae0bf259f854 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 27 Jan 2013 15:41:22 -0800 Subject: bitbake: command: Fix getCmdLineAction bugs Executing "bitbake" doesn't get a sane message since the None return value wasn't being handled correctly. Also fix msg -> cmd_action['msg'] as otherwise an invalid variable is accessed which then crashes the server due to the previous bug. (Bitbake rev: c6211291ae07410832031a5274690437cc2b09a6) Signed-off-by: Richard Purdie --- bitbake/lib/bb/command.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/bb/command.py') diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py index c08e2ce1f5..a143aed355 100644 --- a/bitbake/lib/bb/command.py +++ b/bitbake/lib/bb/command.py @@ -148,8 +148,10 @@ class CommandsSync: Get any command parsed from the commandline """ cmd_action = command.cooker.commandlineAction - if cmd_action['msg']: - raise CommandError(msg) + if cmd_action is None: + return None + elif 'msg' in cmd_action and cmd_action['msg']: + raise CommandError(cmd_action['msg']) else: return cmd_action['action'] -- cgit v1.2.3-54-g00ecf