Add missing methods to the client interface of SObject.

[modules/kernel.git] / bin / runConsole.py

diff --git a/bin/runConsole.py b/bin/runConsole.py
index 337b1eb94da0ea5d8d21f74d3491466399d7ea41..9639291f7f182d730a2e301f360dd7e40c74199d 100644 (file)
--- a/bin/runConsole.py
+++ b/bin/runConsole.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2017  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -62,7 +62,7 @@ For example:
     (options, args) = parser.parse_args(args)
   except Exception, e:
     print e
-    return
+    return {}, []
 
   return options, args
 #
@@ -103,7 +103,7 @@ def __get_running_session(requested_port=None, lastInstanceByDefault=False):
   host, port, filename = None, None, None
   if requested_port:
     print "Search for running instance on port %s..."%requested_port
-    found = [(h,p,f) for h,p,f in available_connexions if p == requested_port]
+    found = [(h,p,f) for h,p,f in available_connexions if int(p) == int(requested_port)]
     if not found:
       print "   ...no running instance found"
     elif len(found) == 1:
@@ -131,7 +131,7 @@ def __get_running_session(requested_port=None, lastInstanceByDefault=False):
   return host, port, filename
 #
 
-import CORBA
+from omniORB import CORBA
 import CosNaming
 import orbmodule
 
@@ -150,8 +150,6 @@ class client(orbmodule.client):
 #
 
 def start_client():
-  print os.getenv("OMNIORB_CONFIG")
-
   try:
     clt = client()
   except Exception:
@@ -200,7 +198,7 @@ def connect(args=None, env=None):
   options, args = __parse_args(args)
   host, port, filename = __get_running_session(options.port)
   if not port:
-    sys.exit(0)
+    return 1
 
   cmd = [
     "os.environ['OMNIORB_CONFIG'] = '%s'"%filename,
@@ -217,7 +215,8 @@ def connect(args=None, env=None):
     absoluteAppliPath = os.getenv('ABSOLUTE_APPLI_PATH','')
     env_copy = os.environ.copy()
     proc = subprocess.Popen(['python', os.path.join(absoluteAppliPath,"bin","salome","runConsole.py"), pickle.dumps(cmd)], shell=False, close_fds=True, env=env_copy)
-    return proc.communicate()
+    proc.communicate()
+    return proc.returncode
 #
 
 if __name__ == "__main__":