openstack
/
nova
Code Issues Proposed changes

Merge ":Add missing %s in print message"

This commit is contained in:
Jenkins 2016-07-27 15:08:38 +00:00 committed by Gerrit Code Review
parent 8e7b5791f0 987decc56c
commit bca79faba3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/exception.py
View File

@ -325,7 +325,7 @@ class InvalidGlobalAPIVersion(Invalid):
class ApiVersionsIntersect(Invalid):
msg_fmt = _("Version of %(name) %(min_ver) %(max_ver) intersects "
msg_fmt = _("Version of %(name)s %(min_ver)s %(max_ver)s intersects "
"with another versions.")

2
nova/volume/encryptors/cryptsetup.py
View File

@ -83,7 +83,7 @@ class CryptsetupEncryptor(base.VolumeEncryptor):
# normal disk or multipath device), exit_code will be 1. In the
# case, we will omit the warning message.
if e.exit_code != 1:
LOG.warning(_LW('cryptsetup status %(dev_name) exited '
LOG.warning(_LW('cryptsetup status %(dev_name)s exited '
'abnormally (status %(exit_code)s): %(err)s'),
{"dev_name": dev_name, "exit_code": e.exit_code,
"err": e.stderr})