X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/39236c6e673c41db228275375ab7fdb0f837b292..04b8595b18b1b41ac7a206e4b3d51a635f8413d7:/tools/lldbmacros/utils.py diff --git a/tools/lldbmacros/utils.py b/tools/lldbmacros/utils.py index 104a528cc..5c7ff72c6 100644 --- a/tools/lldbmacros/utils.py +++ b/tools/lldbmacros/utils.py @@ -27,6 +27,8 @@ def lldb_run_command(cmdstring): lldb_run_command_state['active'] = False if res.Succeeded(): retval = res.GetOutput() + else: + retval = "ERROR:" + res.GetError() return retval def EnableLLDBAPILogging(): @@ -44,9 +46,9 @@ def EnableLLDBAPILogging(): cmd_str = enable_log_base_cmd + ' kdp-remote packets' print cmd_str print lldb_run_command(cmd_str) - print lldb_run_command("verison") + print lldb_run_command("version") print "Please collect the logs from %s for filing a radar. If you had encountered an exception in a lldbmacro command please re-run it." % logfile_name - print "Please make sure to provide the output of 'verison', 'image list' and output of command that failed." + print "Please make sure to provide the output of 'version', 'image list' and output of command that failed." return def GetConnectionProtocol(): @@ -111,6 +113,8 @@ def GetLongestMatchOption(searchstr, options=[], ignore_case=True): so = o if ignore_case: so = o.lower() + if so == searchstr: + return [o] if so.find(searchstr) >=0 : found_options.append(o) return found_options