Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[EDF29322] Revert "[EDF] Taking SALOME launcher options into account through environm...
[modules/kernel.git]
/
bin
/
searchFreePort.py
diff --git
a/bin/searchFreePort.py
b/bin/searchFreePort.py
old mode 100755
(executable)
new mode 100644
(file)
index
cdf304e
..
59ce2f0
--- a/
bin/searchFreePort.py
+++ b/
bin/searchFreePort.py
@@
-1,6
+1,5
@@
-#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+# Copyright (C) 2007-20
24 CEA, EDF
, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-59,7
+58,7
@@
def __setup_config(nsport, args, save_config):
os.symlink(omniorb_config, last_running_config)
pass
pass
os.symlink(omniorb_config, last_running_config)
pass
pass
- except:
+ except
Exception
:
pass
#
#
pass
#
#
@@
-69,27
+68,27
@@
def searchFreePort_withPortManager(queue, args={}, save_config=1, use_port=None)
port = getPort(use_port)
if use_port:
port = getPort(use_port)
if use_port:
- print
"Check if port can be used: %d" % use_port,
+ print
("Check if port can be used: %d" % use_port, end=' ')
if port == use_port and port != -1:
if port == use_port and port != -1:
- print
"- OK"
+ print
("- OK")
__setup_config(use_port, args, save_config)
queue.put([os.environ['OMNIORB_CONFIG'],
os.environ['NSPORT'],
os.environ['NSHOST']])
return
else:
__setup_config(use_port, args, save_config)
queue.put([os.environ['OMNIORB_CONFIG'],
os.environ['NSPORT'],
os.environ['NSHOST']])
return
else:
- print
"- KO: port is busy"
+ print
("- KO: port is busy")
pass
#
pass
#
- print
"Searching for a free port for naming service:",
+ print
("Searching for a free port for naming service:", end=' ')
if port == -1: # try again
port = getPort(use_port)
if port != -1:
if port == -1: # try again
port = getPort(use_port)
if port != -1:
- print
"%s - OK"%(port
)
+ print
("%s - OK"%(port)
)
__setup_config(port, args, save_config)
else:
__setup_config(port, args, save_config)
else:
- print
"Unable to obtain port"
+ print
("Unable to obtain port")
queue.put([os.environ['OMNIORB_CONFIG'],
os.environ['NSPORT'],
queue.put([os.environ['OMNIORB_CONFIG'],
os.environ['NSPORT'],
@@
-99,7
+98,7
@@
def searchFreePort_withPortManager(queue, args={}, save_config=1, use_port=None)
def __savePortToFile(args):
# Save Naming service port name into
# the file args["ns_port_log_file"]
def __savePortToFile(args):
# Save Naming service port name into
# the file args["ns_port_log_file"]
- if
args.has_key('ns_port_log_file')
:
+ if
'ns_port_log_file' in args
:
omniorbUserPath = os.getenv("OMNIORB_USER_PATH")
file_name = os.path.join(omniorbUserPath, args["ns_port_log_file"])
with open(file_name, "w") as f:
omniorbUserPath = os.getenv("OMNIORB_USER_PATH")
file_name = os.path.join(omniorbUserPath, args["ns_port_log_file"])
with open(file_name, "w") as f: