[EDF27562] : Fix clustertest

[modules/kernel.git] / src / Container / ScriptsTemplate / SALOME_CM_REMOTE.py

diff --git a/src/Container/ScriptsTemplate/SALOME_CM_REMOTE.py b/src/Container/ScriptsTemplate/SALOME_CM_REMOTE.py
index 9be7bd72e17f4f3e4505818c30a288b20773a395..f439a541d06656eb160e5d1bfa5b1733e3550849 100644 (file)
--- a/src/Container/ScriptsTemplate/SALOME_CM_REMOTE.py
+++ b/src/Container/ScriptsTemplate/SALOME_CM_REMOTE.py
@@ -2,11 +2,8 @@ import sys
 
 class ScriptRemoteParameters:
     def __init__(self, args):
-        self.debug = False
-        if args[0] == "-d":
-            self.debug = True
-            args = args[1:]
-
+        import KernelBasis
+        self.debug = KernelBasis.VerbosityActivated()
         self.protocol = args[0]
         self.user = self._read_arg(args[1], "NULL")
         self.host = self._read_arg(args[2], "NULL")
@@ -45,8 +42,10 @@ class ScriptRemoteParameters:
 
 # ----------------------------------------------
 def command(args):
+    import KernelBasis
     options = ScriptRemoteParameters(args)
-    if options.debug: print(options)
+    if options.debug:
+        KernelBasis.WriteInStdout( str(options) )
 
     # build command depending on protocol
     cmd = []
@@ -91,14 +90,7 @@ def command(args):
 
     if options.appli_mode == "dir":
         cmd.append(options.appli + "/" + options.remote_script)
-        if not envd:
-            cmd.append("--noenvd")
-        if options.ssl:
-            cmd.append(options.naming_service)
-        else:
-            cmd.append(options.nshost)
-            cmd.append(options.nsport)
-
+            
         if options.workdir:
             cmd.append(" WORKINGDIR '%s'" % options.workdir)
 
@@ -109,7 +101,7 @@ def command(args):
 
         if options.workdir:
             cmd.append("-d " + options.workdir)
-            cmd.append("--")
+        cmd.append("--")
 
     # elif ignore other appli_mode value