From 07f2d1221656be11abb51c79cec9a09bcbeeb5db Mon Sep 17 00:00:00 2001 From: rnv Date: Mon, 7 Apr 2014 13:53:44 +0400 Subject: [PATCH] killSalome.py doesn't work with the new portmanager. --- bin/killSalome.py | 8 +++++++- bin/killSalomeWithPort.py | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/bin/killSalome.py b/bin/killSalome.py index ef06bd45f..0c22df0c0 100755 --- 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 fe36a1e78..c28fba52a 100755 --- 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 -- 2.39.2