# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2023 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
os.environ['OMNIORB_CONFIG'] = fileOmniConfig
# --- set environment variables for port and hostname of NamingService
host, port = getNSparams()
+ try:
+ # keep short name for host, for a correct comparison with getShortHostName() later
+ host=host.split('.')[0]
+ except Exception:
+ pass
else:
# No running session
host = "no_host"
if proc.returncode != 0:
any_error = True
error_code = proc.returncode
- except:
+ except Exception:
any_error = True
pass
tmp_in, tmp_out, tmp_script = __copyFiles(params.user, params.machine, script, sa_obj.args or [], sa_obj.out or [])
# execute command on the remote SALOME application
- command = "ssh %s@%s %s/salome shell " % (params.user, params.machine, params.directory)
+ command = "%s/salome shell" % (params.directory)
if params.port:
- command = command + "-p %s "%params.port
- command = command + " %s %s args:%s"%(header, tmp_script, ",".join(tmp_in))
+ command += " -p %s "%params.port
+ command += " %s %s args:%s"%(header, tmp_script, ",".join(tmp_in))
+ # salome shell command must run in a login shell because of module function
+ command = "ssh %s@%s -t 'bash -l -c \"%s\"'" % (params.user, params.machine, command)
print('[ SSH ] ' + command)
os.system(command)