openstack/deb-heat
Code Issues Proposed changes

Merge "Remove str() before exc to make sure lazy translation work"

Browse Source
This commit is contained in:
Jenkins 2015-03-06 06:49:45 +00:00 committed by Gerrit Code Review
commit f2a1edd3b9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/resources/aws/cfn/stack.py
View File

@ -61,7 +61,7 @@ class NestedStack(stack_resource.StackResource):
raise ValueError(_("Could not fetch remote template '%(url)s': "
"%(exc)s") %
{'url': self.properties[self.TEMPLATE_URL],
'exc': str(r_exc)})
'exc': r_exc})
return template_format.parse(template_data)
@ -105,7 +105,7 @@ class NestedStack(stack_resource.StackResource):
raise ValueError(_("Could not fetch remote template '%(url)s': "
"%(exc)s") %
{'url': self.properties[self.TEMPLATE_URL],
'exc': str(r_exc)})
'exc': r_exc})
template = template_format.parse(template_data)

2
heat/engine/volume_tasks.py
View File

@ -49,7 +49,7 @@ class VolumeExtendTask(object):
if self.clients.client_plugin('cinder').is_client_exception(ex):
raise exception.Error(_(
"Failed to extend volume %(vol)s - %(err)s") % {
'vol': vol.id, 'err': str(ex)})
'vol': vol.id, 'err': ex})
else:
raise