Salome HOME
SSL mode integration : switch back SALOME modules on master branches - patch HOMARD...
[tools/sat_salome.git] / products / patches / xdata-0.9.11.patch
1 diff -Naur --exclude=CVS --exclude=.git xdata-0.9.11_SRC.orig/src/XDATA2SALOME/xsalome.py xdata-0.9.11_SRC/src/XDATA2SALOME/xsalome.py
2 --- xdata-0.9.11_SRC.orig/src/XDATA2SALOME/xsalome.py   2011-10-03 12:07:33.000000000 +0400
3 +++ xdata-0.9.11_SRC/src/XDATA2SALOME/xsalome.py        2015-10-22 12:45:38.000000000 +0300
4 @@ -8,6 +8,19 @@
5  # --
6  #
7  
8 +def getHostName():
9 +    import os
10 +    try:
11 +        import socket
12 +        host = socket.gethostname()
13 +    except:
14 +        host = None
15 +        pass
16 +    if not host: host = os.getenv("HOSTNAME")
17 +    if not host: host = os.getenv("HOST")
18 +    if not host: host = "unknown"
19 +    return host
20 +
21  def searchFreePort():
22      print "Searching a free port for naming service:",
23      NSPORT=2810
24 @@ -19,7 +32,7 @@
25          status = os.system("netstat -ltn | grep -E :%s"%(NSPORT))
26          if status:
27              home = os.environ['HOME']
28 -            hostname = os.environ['HOSTNAME']
29 +            hostname = getHostName()
30              os.environ['OMNIORB_CONFIG'] = '%s/.omniORB_%s.cfg'%(home, NSPORT)
31              f = open(os.environ['OMNIORB_CONFIG'], "w")
32              f.write("ORBInitRef NameService=corbaname::%s:%s\n"%(hostname, NSPORT))
33 @@ -163,7 +176,7 @@
34                  self.study_manager = study_manager
35                  pass
36              #
37 -            theComputer = os.getenv("HOSTNAME")
38 +            theComputer = getHostName()
39              computerSplitName = theComputer.split('.')
40              theComputer = computerSplitName[0]
41              #
42