diff options
author | Ryan Lane <rlane@wikimedia.org> | 2011-01-25 20:50:14 +0000 |
---|---|---|
committer | Ryan Lane <rlane@wikimedia.org> | 2011-01-25 20:50:14 +0000 |
commit | fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d (patch) | |
tree | 9e4c224d36a054136d3a7ec18d0f66da52e05551 /nova/exception.py | |
parent | 2e6a5713d86b487c0b26a72b111531781745aeb2 (diff) | |
parent | b2d0a77c53d1bd108d233e58f68655381cec4e16 (diff) | |
download | nova-fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d.tar.gz nova-fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d.tar.xz nova-fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d.zip |
Merge from trunk
Diffstat (limited to 'nova/exception.py')
-rw-r--r-- | nova/exception.py | 5 |
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) |