From 8ea588cfafcb201f7a0d9e9397ec8807cbb2c53c Mon Sep 17 00:00:00 2001 From: dmv Date: Wed, 8 Sep 2010 15:20:58 +0000 Subject: [PATCH] IPAL21912 WinTC5.1.4: kill_salome.bat doesn't kill Salome --- bin/killSalomeWithPort.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py index 4e1cbbd4f..38e0cf710 100755 --- a/bin/killSalomeWithPort.py +++ b/bin/killSalomeWithPort.py @@ -146,7 +146,12 @@ def killMyPort(port): fpid = open(filedict, 'r') # from salome_utils import generateFileName - fpidomniNames = generateFileName(os.path.join('/tmp/logs', os.getenv('USER')), + if sys.platform == "win32": + username = os.getenv( "USERNAME" ) + else: + username = os.getenv('USER') + path = os.path.join('/tmp/logs', username) + fpidomniNames = generateFileName(path, prefix="", suffix="Pid_omniNames", extension="log", -- 2.39.2