PR : hostname must be without domain extensions (as in hostname -s)

diff --git a/src/Container/SALOME_ComponentPy.py b/src/Container/SALOME_ComponentPy.py
index 2c2a5d0f13034d1497f43dd58a70c352b9f587f7..37b00188e33929a05f71da349789e5c2b56a0fc8 100755 (executable)
--- a/src/Container/SALOME_ComponentPy.py
+++ b/src/Container/SALOME_ComponentPy.py
@@ -31,6 +31,7 @@
 import os
 import sys
 import time
+import string
 from omniORB import CORBA, PortableServer
 import Engines, Engines__POA
 import Registry
@@ -73,7 +74,8 @@ class SALOME_ComponentPy_i (Engines__POA.Component):
         self._Executed = 0
 
         naming_service = SALOME_NamingServicePy_i(self._orb)
-        Component_path = "/Containers/" +  os.getenv( "HOSTNAME" ) + "/" + self._containerName + "/" + self._interfaceName
+        myMachine=string.split(os.getenv( "HOSTNAME" ),'.')
+        Component_path = "/Containers/" + myMachine[0] + "/" + self._containerName + "/" + self._interfaceName
         MESSAGE(  'SALOME_ComponentPy_i Register' + str( Component_path ) )
         naming_service.Register(self._this(), Component_path)
 

diff --git a/src/LifeCycleCORBA/LifeCycleCORBA.py b/src/LifeCycleCORBA/LifeCycleCORBA.py
index fe19bfdffe2076dbfb39164187782c825f045903..448491864e96b1ee4a1ca18ac4ba94b9a90cfc7f 100644 (file)
--- a/src/LifeCycleCORBA/LifeCycleCORBA.py
+++ b/src/LifeCycleCORBA/LifeCycleCORBA.py
@@ -29,6 +29,7 @@
 import os
 import sys
 import time
+import string
 from omniORB import CORBA
 import CosNaming
 import Engines
@@ -133,7 +134,8 @@ class LifeCycleCORBA:
         aContainer = self.FindContainer( theComputer + "/" + theContainer )
         if aContainer is None :
             if (theContainer == "FactoryServer") | (theContainer == "FactoryServerPy") :
-                if theComputer == os.getenv("HOSTNAME") :
+                myMachine=string.split(os.getenv( "HOSTNAME" ),'.')
+                if theComputer == myMachine[0] :
                     rshstr = ""
                 else :
                     rshstr = "rsh -n " + theComputer + " "