Try to kill Salome application when a YACS Launcher job is killed

[modules/kernel.git] / src / Utils / Utils_Identity.py

diff --git a/src/Utils/Utils_Identity.py b/src/Utils/Utils_Identity.py
index 489060f8cebb00521b2f3dedc739a717f719dee3..e9c216d70bcee1dcd59b95da9b00a57a09f8fbf4 100644 (file)
--- a/src/Utils/Utils_Identity.py
+++ b/src/Utils/Utils_Identity.py
@@ -1,30 +1,34 @@
 #! /usr/bin/env python
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2011  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
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
 #
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  SALOME Utils : general SALOME's definitions and tools
 #  File   : Utils_Identity.py
 #  Author : Estelle Deville, CEA
 #  Module : SALOME
 #  $Header$
+## @package Utils_Identity
+# \brief Module to get information about user and version
 #
 import sys
 import os
@@ -32,13 +36,14 @@ import socket
 
 if not sys.platform == "win32":
     import pwd
-       
+
 import time
 import string
 
 def getShortHostName():
     """
     gives Hostname without domain extension.
+
     SALOME naming service needs short Hostnames (without domain extension).
     HOSTNAME is not allways defined in environment,
     socket.gethostname() gives short or complete Hostname, depending on
@@ -51,18 +56,18 @@ class Identity:
         self._name = name
         self._pid =  os.getpid()
         self._machine = socket.gethostname()
-        self._adip     =  socket.gethostbyname(self._machine) # IP adress        
+        self._adip =  socket.gethostbyname(self._machine) # IP adress        
         if sys.platform == "win32":
-           self._uid    = os.getpid() 
-           self._pwname = os.environ["USER"]
-       else:
-            self._uid  = os.getuid()
-            list = pwd.getpwuid(self._uid)
-           self._pwname        = list[0] # user name
+          self._uid  = os.getpid() 
+          self._pwname = os.environ["USERNAME"]
+        else:
+          self._uid = os.getuid()
+          list = pwd.getpwuid(self._uid)
+          self._pwname  = list[0] # user name
 
-        self._tc_start = time.time()
+        self._tc_start = time.time()
         self._cstart    = time.ctime(self._tc_start)
-        self._cdir     = os.getcwd()
+        self._cdir = os.getcwd()
 
 def getapplipath():
     """