killSalome.py doesn't work with the new portmanager.

diff --git a/bin/killSalome.py b/bin/killSalome.py
index ef06bd45fce94fdad3e76c5183490a1e2b91c58d..0c22df0c02f0ef05df21c5cf1a7a62c8be067ab2 100755 (executable)
--- a/bin/killSalome.py
+++ b/bin/killSalome.py
@@ -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,5 +94,11 @@ def killAllPorts():
     pass
 
 if __name__ == "__main__":
+    try:
+        from salomeLauncherUtils import setOmniOrbUserPath
+        setOmniOrbUserPath()
+    except Exception, e:
+        print e
+        sys.exit(1)
     killAllPorts()
     pass

diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py
index fe36a1e782eb8fd1ef8d13b91730cab2465bc525..c28fba52a5496365830c1e955a234bfa4ab6f992 100755 (executable)
--- a/bin/killSalomeWithPort.py
+++ b/bin/killSalomeWithPort.py
@@ -407,6 +407,12 @@ if __name__ == "__main__":
             pass
         sys.exit(0)
         pass
+    try:
+        from salomeLauncherUtils import setOmniOrbUserPath
+        setOmniOrbUserPath()
+    except Exception, e:
+        print e
+        sys.exit(1)
     for port in sys.argv[1:]:
         killMyPort(port)
         pass