Commit 841e7703 authored by Mark Florisson's avatar Mark Florisson

Friendly error if no Cython or Python stack is there and inferior is running

parent dcd7f2a7
...@@ -1980,7 +1980,7 @@ class PythonCodeExecutor(object): ...@@ -1980,7 +1980,7 @@ class PythonCodeExecutor(object):
globalsp = pointervalue(global_dict) globalsp = pointervalue(global_dict)
localsp = pointervalue(local_dict) localsp = pointervalue(local_dict)
if globalp == 0 or localp == 0: if globalsp == 0 or localsp == 0:
raise gdb.GdbError("Unable to obtain or create locals or globals.") raise gdb.GdbError("Unable to obtain or create locals or globals.")
code = """ code = """
...@@ -2058,7 +2058,8 @@ class FixGdbCommand(gdb.Command): ...@@ -2058,7 +2058,8 @@ class FixGdbCommand(gdb.Command):
Program exited normally. Program exited normally.
""" """
warnings.filterwarnings('ignore', r'.*', RuntimeWarning, re.escape(__name__)) warnings.filterwarnings('ignore', r'.*', RuntimeWarning,
re.escape(__name__))
try: try:
long(gdb.parse_and_eval("(void *) 0")) == 0 long(gdb.parse_and_eval("(void *) 0")) == 0
except RuntimeError: except RuntimeError:
...@@ -2067,7 +2068,10 @@ class FixGdbCommand(gdb.Command): ...@@ -2067,7 +2068,10 @@ class FixGdbCommand(gdb.Command):
def invoke(self, args, from_tty): def invoke(self, args, from_tty):
self.fix_gdb() self.fix_gdb()
try:
gdb.execute('%s %s' % (self.actual_command, args)) gdb.execute('%s %s' % (self.actual_command, args))
except RuntimeError, e:
raise gdb.GdbError(str(e))
self.fix_gdb() self.fix_gdb()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment