diff options
| author | Cory Wright <cory.wright@rackspace.com> | 2010-12-22 11:28:25 -0500 |
|---|---|---|
| committer | Cory Wright <cory.wright@rackspace.com> | 2010-12-22 11:28:25 -0500 |
| commit | ba7afd00a4ea826fc12113d98de391aace1fd2d2 (patch) | |
| tree | df35d22040e8bcd0cd79d2b841efd1386b67554d /nova/exception.py | |
| parent | 4ef1a234aaee98e55a5d8e3d8fac1f8f282c803d (diff) | |
| parent | d9b37f9a3b6cc7dbf6026ceb94b9e4c585e59e01 (diff) | |
| download | nova-ba7afd00a4ea826fc12113d98de391aace1fd2d2.tar.gz nova-ba7afd00a4ea826fc12113d98de391aace1fd2d2.tar.xz nova-ba7afd00a4ea826fc12113d98de391aace1fd2d2.zip | |
merging trunk
Diffstat (limited to 'nova/exception.py')
| -rw-r--r-- | nova/exception.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/exception.py b/nova/exception.py index 9af4017ba..277033e0f 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -31,11 +31,11 @@ class ProcessExecutionError(IOError): def __init__(self, stdout=None, stderr=None, exit_code=None, cmd=None, description=None): if description is None: - description = "Unexpected error while running command." + 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 = _("%s\nCommand: %s\nExit code: %s\nStdout: %r\nStderr: %r")\ + % (description, cmd, exit_code, stdout, stderr) IOError.__init__(self, message) @@ -84,7 +84,7 @@ def wrap_exception(f): except Exception, e: if not isinstance(e, Error): #exc_type, exc_value, exc_traceback = sys.exc_info() - logging.exception('Uncaught exception') + logging.exception(_('Uncaught exception')) #logging.error(traceback.extract_stack(exc_traceback)) raise Error(str(e)) raise |