X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2FrunSalome.py;h=63652278c9a33a36031b3595c40e01dcdacc5867;hb=f6f9c5bd0eb17ab1f0cb40d4761995f48f093526;hp=99b7d18f5d2e725226619c35b930f75797f8c0bc;hpb=0fac7040be417aab7228a4e23904b4cf22a8dda4;p=modules%2Fkernel.git diff --git a/bin/runSalome.py b/bin/runSalome.py index 99b7d18f5..63652278c 100755 --- a/bin/runSalome.py +++ b/bin/runSalome.py @@ -764,7 +764,7 @@ def useSalome(args, modules_list, modules_root_dir): if not args['gui'] or not args['session_gui']: toimport = args['pyscript'] - from salomeLauncherUtils import formatScriptsAndArgs + from salomeContextUtils import formatScriptsAndArgs command = formatScriptsAndArgs(toimport) if command: proc = subprocess.Popen(command, shell=True) @@ -812,9 +812,9 @@ def no_main(): searchFreePort(args, 0) clt = useSalome(args, modules_list, modules_root_dir) - if args.has_key('shutdown_servers') : + if args.has_key('shutdown_servers') : var = args['shutdown_servers'] - if hasattr(var, 'delete') and callable(getattr(var, 'delete')) : + if hasattr(var, 'delete') and callable(getattr(var, 'delete')) : var.delete() return clt @@ -825,7 +825,7 @@ def main(): # define folder to store omniorb config (initially in virtual application folder) try: - from salomeLauncherUtils import setOmniOrbUserPath + from salomeContextUtils import setOmniOrbUserPath setOmniOrbUserPath() except Exception, e: print e @@ -944,9 +944,9 @@ def runSalome(): foreGround(clt, args) pass # -- - if args.has_key('shutdown_servers') : + if args.has_key('shutdown_servers') : var = args['shutdown_servers'] - if hasattr(var, 'delete') and callable(getattr(var, 'delete')) : + if hasattr(var, 'delete') and callable(getattr(var, 'delete')) : var.delete() pass #