Support of multi key,var append in global vars.

[modules/yacs.git] / bin / killSalome.py

diff --git a/bin/killSalome.py b/bin/killSalome.py
index 0c22df0c02f0ef05df21c5cf1a7a62c8be067ab2..73aaf78f1332ca42eff0326e0d30a9ad4c391d4c 100755 (executable)
--- a/bin/killSalome.py
+++ b/bin/killSalome.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -30,12 +30,13 @@ import os, sys, re, signal
 
 from killSalomeWithPort import killMyPort, getPiDict
 #from salome_utils import getHostName, getShortHostName
+from salome_utils import getUserName
 
 def killAllPorts():
     """
     Kill all SALOME sessions belonging to the user.
     """
-    user = os.getenv('USER')
+    user = getUserName()
     #hostname  = getHostName()
     #shostname = getShortHostName()
     # new-style dot-prefixed pidict file
@@ -95,7 +96,7 @@ def killAllPorts():
 
 if __name__ == "__main__":
     try:
-        from salomeLauncherUtils import setOmniOrbUserPath
+        from salomeContextUtils import setOmniOrbUserPath
         setOmniOrbUserPath()
     except Exception, e:
         print e