summaryrefslogtreecommitdiffstats
path: root/lldb/source/Commands/CommandObjectCommands.cpp
diff options
context:
space:
mode:
authorEnrico Granata <egranata@apple.com>2013-06-25 23:43:28 +0000
committerEnrico Granata <egranata@apple.com>2013-06-25 23:43:28 +0000
commitb4675a4e12d7120b1b81c41b63b9da55265810a1 (patch)
tree0bdb2f0597a77974186bfe6cee577b0481cee42b /lldb/source/Commands/CommandObjectCommands.cpp
parentcc077ad634f14f54f8bb3ac7b6e7c1290f6c701e (diff)
downloadbcm5719-llvm-b4675a4e12d7120b1b81c41b63b9da55265810a1.tar.gz
bcm5719-llvm-b4675a4e12d7120b1b81c41b63b9da55265810a1.zip
<rdar://problem/14266411>
The semi-unofficial way of returning a status from a Python command was to return a string (e.g. return "no such variable was found") that LLDB would pick as a clue of an error having happened This checkin changes that: - SBCommandReturnObject now exports a SetError() call, which can take an SBError or a plain C-string - script commands now drop any return value and expect the SBCommandReturnObject ("return object") to be filled in appropriately - if you do nothing, a success will be assumed If your commands were relying on returning a value and having LLDB pick that up as an error, please change your commands to SetError() through the return object or expect changes in behavior llvm-svn: 184893
Diffstat (limited to 'lldb/source/Commands/CommandObjectCommands.cpp')
-rw-r--r--lldb/source/Commands/CommandObjectCommands.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/lldb/source/Commands/CommandObjectCommands.cpp b/lldb/source/Commands/CommandObjectCommands.cpp
index 223083677ec..bbea0851834 100644
--- a/lldb/source/Commands/CommandObjectCommands.cpp
+++ b/lldb/source/Commands/CommandObjectCommands.cpp
@@ -1330,7 +1330,9 @@ protected:
// Don't change the status if the command already set it...
if (result.GetStatus() == eReturnStatusInvalid)
{
- if (result.GetOutputData() == NULL || result.GetOutputData()[0] == '\0')
+ if (result.GetErrorData() && result.GetErrorData()[0])
+ result.SetStatus(eReturnStatusFailed);
+ else if (result.GetOutputData() == NULL || result.GetOutputData()[0] == '\0')
result.SetStatus(eReturnStatusSuccessFinishNoResult);
else
result.SetStatus(eReturnStatusSuccessFinishResult);
OpenPOWER on IntegriCloud