summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-01-25 21:46:12 +0000
committerRick Harris <rick.harris@rackspace.com>2011-01-25 21:46:12 +0000
commit9fac0cefb1ba4d7ffa85315a3843ef70ce37691c (patch)
tree2c9fb564896647b3c25627a4b27682bd7530fb53 /nova/exception.py
parenta9ab2d0f0618f855686cb8713b28c3737faabdcc (diff)
parent705cbaa3d311c21cf2a7318e52a60eeadebb435a (diff)
downloadnova-9fac0cefb1ba4d7ffa85315a3843ef70ce37691c.tar.gz
nova-9fac0cefb1ba4d7ffa85315a3843ef70ce37691c.tar.xz
nova-9fac0cefb1ba4d7ffa85315a3843ef70ce37691c.zip
Merge trunk
Diffstat (limited to 'nova/exception.py')
-rw-r--r--nova/exception.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/exception.py b/nova/exception.py
index ecd814e5d..2320e2214 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -33,8 +33,9 @@ class ProcessExecutionError(IOError):
description = _("Unexpected error while running command.")
if exit_code is None:
exit_code = '-'
- message = _("%s\nCommand: %s\nExit code: %s\nStdout: %r\nStderr: %r")\
- % (description, cmd, exit_code, stdout, stderr)
+ message = _("%(description)s\nCommand: %(cmd)s\n"
+ "Exit code: %(exit_code)s\nStdout: %(stdout)r\n"
+ "Stderr: %(stderr)r") % locals()
IOError.__init__(self, message)