diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-11 17:27:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-11 17:27:45 +0000 |
| commit | bd30dae12eb4e58f269eecdfab37d1f95fdcbe89 (patch) | |
| tree | 150d1b89dc63360385629a0e9d2157110cd25316 /nova | |
| parent | f543f347c84e7f5de2c584ca55363e4dee5b0a3d (diff) | |
| parent | aa1966dbd6de4744798a800f212357697c49068e (diff) | |
| download | nova-bd30dae12eb4e58f269eecdfab37d1f95fdcbe89.tar.gz nova-bd30dae12eb4e58f269eecdfab37d1f95fdcbe89.tar.xz nova-bd30dae12eb4e58f269eecdfab37d1f95fdcbe89.zip | |
Merge "Simple syntax fix up."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/compute/api.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index dc90748a4..03e9f5445 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -445,7 +445,7 @@ class API(base.Base): try: new_name = (CONF.multi_instance_display_name_template % params) - except KeyError, TypeError: + except (KeyError, TypeError): LOG.exception(_('Failed to set instance name using ' 'multi_instance_display_name_template.')) new_name = instance['display_name'] |