#! /usr/bin/env python3
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2017 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2020 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
# full path to the pidict file is requested
if hidden:
# new-style dot-prefixed pidict files
- # are in the system-dependant temporary diretory
+ # are in the system-dependant temporary directory
dir = getLogDir()
else:
# old-style non-dot-prefixed pidict files
# are in the user's home directory
- dir = os.getenv("HOME")
+ dir = os.path.expanduser("~")
pass
pass
time.sleep(1)
# shutdown omniNames
if cleanup:
- lcc.killOmniNames()
- time.sleep(1)
- pass
+ from salome_utils import killOmniNames
+ killOmniNames(port)
+ filedict=getPiDict(port)
+ __killMyPort(port, filedict)
+ from PortManager import releasePort
+ releasePort(port)
+ time.sleep(1)
+ pass
pass
except:
pass
sys.exit(0) # see (1)
pass
# (1) If --shutdown-servers option is set to 1, session close procedure is
-# called twice: first explicitely by salome command, second by automatic
+# called twice: first explicitly by salome command, second by automatic
# atexit to handle Ctrl-C. During second call, LCC does not exist anymore and
-# a RuntimeError is raised; we explicitely exit this function with code 0 to
+# a RuntimeError is raised; we explicitly exit this function with code 0 to
# prevent parent thread from crashing.
def __killMyPort(port, filedict):