diff -r 22633c0739e2 -r 2390df6f42ba Debugger/DebuggerInterfaceRuby.py
--- a/Debugger/DebuggerInterfaceRuby.py Tue Mar 11 18:56:38 2014 +0100
+++ b/Debugger/DebuggerInterfaceRuby.py Tue Mar 11 20:07:05 2014 +0100
@@ -141,8 +141,9 @@
@param port portnumber the debug server is listening on (integer)
@param runInConsole flag indicating to start the debugger in a
console window (boolean)
- @return client process object (QProcess) and a flag to indicate
- a network connection (boolean)
+ @return client process object (QProcess), a flag to indicate
+ a network connection (boolean) and the name of the interpreter
+ in case of a local execution (string)
"""
interpreter = Preferences.getDebugger("RubyInterpreter")
if interpreter == "":
@@ -150,7 +151,7 @@
None,
self.tr("Start Debugger"),
self.tr("""<p>No Ruby interpreter configured.</p>"""))
- return None, False
+ return None, False, ""
debugClient = os.path.join(
getConfig('ericDir'), "DebugClients", "Ruby", "DebugClient.rb")
@@ -186,7 +187,7 @@
self.translate = self.__remoteTranslation
else:
self.translate = self.__identityTranslation
- return process, self.__isNetworked
+ return process, self.__isNetworked, ""
# set translation function
self.translate = self.__identityTranslation
@@ -223,7 +224,7 @@
self.tr(
"""<p>The debugger backend could not be"""
""" started.</p>"""))
- return process, self.__isNetworked
+ return process, self.__isNetworked, interpreter
process = self.__startProcess(
interpreter,
@@ -235,7 +236,7 @@
self.tr("Start Debugger"),
self.tr(
"""<p>The debugger backend could not be started.</p>"""))
- return process, self.__isNetworked
+ return process, self.__isNetworked, interpreter
def startRemoteForProject(self, port, runInConsole):
"""
@@ -244,12 +245,13 @@
@param port portnumber the debug server is listening on (integer)
@param runInConsole flag indicating to start the debugger in a
console window (boolean)
- @return pid of the client process (integer) and a flag to indicate
- a network connection (boolean)
+ @return client process object (QProcess), a flag to indicate
+ a network connection (boolean) and the name of the interpreter
+ in case of a local execution (string)
"""
project = e5App().getObject("Project")
if not project.isDebugPropertiesLoaded():
- return None, self.__isNetworked
+ return None, self.__isNetworked, ""
# start debugger with project specific settings
interpreter = project.getDebugProperty("INTERPRETER")
@@ -285,7 +287,7 @@
self.translate = self.__remoteTranslation
else:
self.translate = self.__identityTranslation
- return process, self.__isNetworked
+ return process, self.__isNetworked, ""
# set translation function
self.translate = self.__identityTranslation
@@ -323,7 +325,7 @@
self.tr(
"""<p>The debugger backend could not be"""
""" started.</p>"""))
- return process, self.__isNetworked
+ return process, self.__isNetworked, interpreter
process = self.__startProcess(
interpreter,
@@ -335,7 +337,7 @@
self.tr("Start Debugger"),
self.tr(
"""<p>The debugger backend could not be started.</p>"""))
- return process, self.__isNetworked
+ return process, self.__isNetworked, interpreter
def getClientCapabilities(self):
"""
