diff options
| author | Ricardo Carrillo Cruz <emaildericky@gmail.com> | 2011-01-25 15:33:19 +0100 |
|---|---|---|
| committer | Ricardo Carrillo Cruz <emaildericky@gmail.com> | 2011-01-25 15:33:19 +0100 |
| commit | 3ad22216eee67abfabb28efe2561f0fdcf10e6e1 (patch) | |
| tree | f4288525d1ec55edfcd48dbb83cb913af95a001b /nova/exception.py | |
| parent | 34d1022e8fbcfe2b6aaf30c6916ad01f0fe1769c (diff) | |
| parent | 07f39806f3b82d5d06371758e3efe597a47434ed (diff) | |
| download | nova-3ad22216eee67abfabb28efe2561f0fdcf10e6e1.tar.gz nova-3ad22216eee67abfabb28efe2561f0fdcf10e6e1.tar.xz nova-3ad22216eee67abfabb28efe2561f0fdcf10e6e1.zip | |
Fixed merge conflict
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) |