Merge ":Add missing %s in print message"
This commit is contained in:
commit
bca79faba3
|
@ -325,7 +325,7 @@ class InvalidGlobalAPIVersion(Invalid):
|
||||||
|
|
||||||
|
|
||||||
class ApiVersionsIntersect(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.")
|
"with another versions.")
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -83,7 +83,7 @@ class CryptsetupEncryptor(base.VolumeEncryptor):
|
||||||
# normal disk or multipath device), exit_code will be 1. In the
|
# normal disk or multipath device), exit_code will be 1. In the
|
||||||
# case, we will omit the warning message.
|
# case, we will omit the warning message.
|
||||||
if e.exit_code != 1:
|
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'),
|
'abnormally (status %(exit_code)s): %(err)s'),
|
||||||
{"dev_name": dev_name, "exit_code": e.exit_code,
|
{"dev_name": dev_name, "exit_code": e.exit_code,
|
||||||
"err": e.stderr})
|
"err": e.stderr})
|
||||||
|
|
Loading…
Reference in New Issue