From: aguerre Date: Mon, 13 Jan 2014 13:22:53 +0000 (+0000) Subject: Fix bug on print formatting X-Git-Tag: V7_main_EDF_patch_concurrent_140113~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ba5a6492f6ac52202fbb91200cf77eaac22ad99e;p=modules%2Fkernel.git Fix bug on print formatting --- diff --git a/bin/killSalome.py b/bin/killSalome.py index f03beaa04..d83427152 100755 --- a/bin/killSalome.py +++ b/bin/killSalome.py @@ -1,6 +1,6 @@ #! /usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2014 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 diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py index 1d8b590b7..93fc46d0f 100755 --- a/bin/killSalomeWithPort.py +++ b/bin/killSalomeWithPort.py @@ -291,7 +291,7 @@ def killMyPort(port): - port - port number """ from salome_utils import getShortHostName, getHostName - print "Terminating SALOME on port %d..."%(port) + print "Terminating SALOME on port %s..."%(port) # try to shutdown session normally import threading, time @@ -305,7 +305,7 @@ def killMyPort(port): all_files = glob.glob("%s*"%filedict) for f in all_files: __killMyPort(port, f) - except: + except ImportError: # new-style dot-prefixed pidict file filedict = getPiDict(port, hidden=True) # provide compatibility with old-style pidict file (not dot-prefixed)