summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-01-25 09:00:56 -0800
committerTodd Willey <todd@ansolabs.com>2011-01-25 09:00:56 -0800
commita964fc3a8efad33b0dbb94e8a128c512a248f7f1 (patch)
tree1d40ee63f45cc8fae3f089621e8e64bf95a3d71e /nova/exception.py
parentf02c9e781bdddd609601da81b97a438b6d5b9781 (diff)
parent07f39806f3b82d5d06371758e3efe597a47434ed (diff)
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)