0023629: [CEA] KERNEL_SALOME_CONCURRENT_TestConcurrentSession: does not return

[modules/kernel.git] / bin / appliskel / salome

diff --git a/bin/appliskel/salome b/bin/appliskel/salome
index b8b43e800f505ecc2a3c53c390a0c23ad420533e..e397ba801abe419de1e4f4f770122855019f4ccb 100755 (executable)
--- a/bin/appliskel/salome
+++ b/bin/appliskel/salome
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 import os
 import subprocess
@@ -15,18 +15,15 @@ def main(args):
         env_modules_option = "--with-env-modules="
         env_modules_l = [x for x in args if x.startswith(env_modules_option)]
         if env_modules_l:
-          env_modules += env_modules_l[-1][len(env_modules_option):].split(',')
-          args = [x for x in args if not x.startswith(env_modules_option)]
+            env_modules += env_modules_l[-1][len(env_modules_option):].split(',')
+            args = [x for x in args if not x.startswith(env_modules_option)]
         env_modules_option += "%s" % ','.join(env_modules)
         args.append(env_modules_option)
 
-    currentPath = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
-    proc = subprocess.Popen(['./.salome_run'] + args,
-                            close_fds=True, cwd=currentPath)
+    appliPath = os.path.dirname(os.path.realpath(__file__))
+    proc = subprocess.Popen([os.path.join(appliPath, '.salome_run')] + args, close_fds=True)
     out, err = proc.communicate()
-    return out, err, proc.returncode
+    sys.exit(proc.returncode)
 
 if __name__ == "__main__":
     main(sys.argv[1:])
-#
-