From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 14 Dec 2012 12:27:33 +0000 (+0000)
Subject: command: Fix getCmdLineAction bugs
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6211291ae07410832031a5274690437cc2b09a6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/command.py b/lib/bb/command.py
index 39a2e18a023..c842497e63b 100644
--- a/lib/bb/command.py
+++ b/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']