Merge branch 'omu/SalomeLauncher'

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

diff --git a/bin/killSalome.py b/bin/killSalome.py
index 020f7ed4497b13962e70aa2e86a90a351cfae35d..24e125f07e88d5f862671b8e560bb735810044aa 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-2012  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
@@ -8,7 +8,7 @@
 # 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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -47,7 +47,7 @@ def killAllPorts():
     #if hostname in fpidict:
     #    fpidict = fpidict.replace(hostname, shostname+".*")
     fpidict   = fpidict.replace('#####', '(\d*)')
-    fnamere   = re.compile("^%s$" % fpidict)
+    fnamere   = re.compile("^%s" % fpidict)
     try:
         for f in os.listdir(dirpidict):
             mo = fnamere.match(f)
@@ -94,6 +94,11 @@ def killAllPorts():
     pass
 
 if __name__ == "__main__":
+    try:
+        from salomeContextUtils import setOmniOrbUserPath
+        setOmniOrbUserPath()
+    except Exception, e:
+        print e
+        sys.exit(1)
     killAllPorts()
     pass
-