openstack/deb-cinder
Code Issues Proposed changes

fix the %{} when string formating

Browse Source 
use %() instead of %{} when string formating

Closes-Bug #1622289
Change-Id: I1bd15c03cf3df9e1ec16a518383407eff5594f56
This commit is contained in:
xianming mao 2016-09-08 14:58:59 +08:00
parent 7ff588cd95
commit 42a5c8eeae
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/volume/drivers/violin/v7000_common.py
View File

@ -781,7 +781,7 @@ class V7000Common(object):
raise loopingcall.LoopingCallDone(retvalue=True) raise loopingcall.LoopingCallDone(retvalue=True)
elif mb_copied is not None: elif mb_copied is not None:
# copy is in progress # copy is in progress
LOG.debug("MB copied: %{copied}d, percent done: %{percent}d.", LOG.debug("MB copied: %(copied)d, percent done: %(percent)d.",
{'copied': mb_copied, 'percent': percent}) {'copied': mb_copied, 'percent': percent})
pass pass
elif percent == 0: elif percent == 0:
@ -794,7 +794,7 @@ class V7000Common(object):
raise loopingcall.LoopingCallDone(retvalue=True) raise loopingcall.LoopingCallDone(retvalue=True)
else: else:
# unexpected case # unexpected case
LOG.debug("unexpected case (%{id}s, %{bytes}s, %{percent}s)", LOG.debug("unexpected case (%(id)s, %(bytes)s, %(percent)s)",
{'id': target_id, {'id': target_id,
'bytes': mb_copied, 'bytes': mb_copied,
'percent': six.text_type(percent)}) 'percent': six.text_type(percent)})

2
cinder/volume/targets/cxt.py
View File

@ -139,7 +139,7 @@ class CxtAdm(iscsi.ISCSITarget):
old_name = kwargs.get('old_name', None) old_name = kwargs.get('old_name', None)
if old_name: if old_name:
LOG.debug('Detected old persistence file for volume ' LOG.debug('Detected old persistence file for volume '
'%{vol}s at %{old_name}s', '%(vol)s at %(old_name)s',
{'vol': vol_id, 'old_name': old_name}) {'vol': vol_id, 'old_name': old_name})
old_persist_file = os.path.join(volumes_dir, old_name) old_persist_file = os.path.join(volumes_dir, old_name)

2
cinder/volume/targets/tgt.py
View File

@ -171,7 +171,7 @@ class TgtAdm(iscsi.ISCSITarget):
old_name = kwargs.get('old_name', None) old_name = kwargs.get('old_name', None)
if old_name is not None: if old_name is not None:
LOG.debug('Detected old persistence file for volume ' LOG.debug('Detected old persistence file for volume '
'%{vol}s at %{old_name}s', '%(vol)s at %(old_name)s',
{'vol': vol_id, 'old_name': old_name}) {'vol': vol_id, 'old_name': old_name})
old_persist_file = os.path.join(volumes_dir, old_name) old_persist_file = os.path.join(volumes_dir, old_name)