diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-14 01:28:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-14 01:28:54 +0000 |
| commit | f945cf7b5c263ca2fa47c636b498cd286b9767db (patch) | |
| tree | f708d0b66bc70c2a42baea08195e4874d1b64120 /openstackclient | |
| parent | 7aa7b3a76b33a7d09f168550f3b58d4199203f6e (diff) | |
| parent | 1c91e9828d64c927cc28d9de61dd56887ca59dff (diff) | |
| download | python-openstackclient-f945cf7b5c263ca2fa47c636b498cd286b9767db.tar.gz | |
Merge "Handle log message interpolation by the logger in compute/"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/compute/v2/aggregate.py | 4 | ||||
| -rw-r--r-- | openstackclient/compute/v2/flavor.py | 7 | ||||
| -rw-r--r-- | openstackclient/compute/v2/keypair.py | 3 | ||||
| -rw-r--r-- | openstackclient/compute/v2/service.py | 3 |
4 files changed, 7 insertions, 10 deletions
diff --git a/openstackclient/compute/v2/aggregate.py b/openstackclient/compute/v2/aggregate.py index 76ba5cc6..7f9161a9 100644 --- a/openstackclient/compute/v2/aggregate.py +++ b/openstackclient/compute/v2/aggregate.py @@ -128,8 +128,8 @@ class DeleteAggregate(command.Command): except Exception as e: result += 1 LOG.error(_("Failed to delete aggregate with name or " - "ID '%(aggregate)s': %(e)s") - % {'aggregate': a, 'e': e}) + "ID '%(aggregate)s': %(e)s"), + {'aggregate': a, 'e': e}) if result > 0: total = len(parsed_args.aggregate) diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py index 7e213f73..009c9bd1 100644 --- a/openstackclient/compute/v2/flavor.py +++ b/openstackclient/compute/v2/flavor.py @@ -171,7 +171,7 @@ class CreateFlavor(command.ShowOne): except Exception as e: msg = _("Failed to add project %(project)s access to " "flavor: %(e)s") - LOG.error(msg % {'project': parsed_args.project, 'e': e}) + LOG.error(msg, {'project': parsed_args.project, 'e': e}) if parsed_args.property: try: flavor.set_keys(parsed_args.property) @@ -208,8 +208,7 @@ class DeleteFlavor(command.Command): except Exception as e: result += 1 LOG.error(_("Failed to delete flavor with name or " - "ID '%(flavor)s': %(e)s") - % {'flavor': f, 'e': e}) + "ID '%(flavor)s': %(e)s"), {'flavor': f, 'e': e}) if result > 0: total = len(parsed_args.flavor) @@ -412,7 +411,7 @@ class ShowFlavor(command.ShowOne): except Exception as e: msg = _("Failed to get access projects list " "for flavor '%(flavor)s': %(e)s") - LOG.error(msg % {'flavor': parsed_args.flavor, 'e': e}) + LOG.error(msg, {'flavor': parsed_args.flavor, 'e': e}) flavor = resource_flavor._info.copy() flavor.update({ diff --git a/openstackclient/compute/v2/keypair.py b/openstackclient/compute/v2/keypair.py index a63cbfec..2a8524d6 100644 --- a/openstackclient/compute/v2/keypair.py +++ b/openstackclient/compute/v2/keypair.py @@ -106,8 +106,7 @@ class DeleteKeypair(command.Command): except Exception as e: result += 1 LOG.error(_("Failed to delete key with name " - "'%(name)s': %(e)s") - % {'name': n, 'e': e}) + "'%(name)s': %(e)s"), {'name': n, 'e': e}) if result > 0: total = len(parsed_args.name) diff --git a/openstackclient/compute/v2/service.py b/openstackclient/compute/v2/service.py index 9c384f05..7b18c2e5 100644 --- a/openstackclient/compute/v2/service.py +++ b/openstackclient/compute/v2/service.py @@ -50,8 +50,7 @@ class DeleteService(command.Command): except Exception as e: result += 1 LOG.error(_("Failed to delete compute service with " - "ID '%(service)s': %(e)s") - % {'service': s, 'e': e}) + "ID '%(service)s': %(e)s"), {'service': s, 'e': e}) if result > 0: total = len(parsed_args.service) |