diff options
| author | jaypipes@gmail.com <> | 2010-12-21 10:25:39 -0500 |
|---|---|---|
| committer | jaypipes@gmail.com <> | 2010-12-21 10:25:39 -0500 |
| commit | 887ee0aae54fc51124bb869af2bfee055a46d27a (patch) | |
| tree | 3554feb1fba402ad064a4ac0b154d34f998040ff /nova/exception.py | |
| parent | 1b4b36cec4d82009d595a601c408e2f582ef790c (diff) | |
| parent | 086f2d87be3c56ac8dafaf4551096868d57454db (diff) | |
| download | nova-887ee0aae54fc51124bb869af2bfee055a46d27a.tar.gz nova-887ee0aae54fc51124bb869af2bfee055a46d27a.tar.xz nova-887ee0aae54fc51124bb869af2bfee055a46d27a.zip | |
Merge trunk and resolve conflicts
Diffstat (limited to 'nova/exception.py')
| -rw-r--r-- | nova/exception.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/exception.py b/nova/exception.py index fd8b00368..277033e0f 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -27,6 +27,7 @@ import traceback class ProcessExecutionError(IOError): + def __init__(self, stdout=None, stderr=None, exit_code=None, cmd=None, description=None): if description is None: @@ -39,11 +40,13 @@ class ProcessExecutionError(IOError): class Error(Exception): + def __init__(self, message=None): super(Error, self).__init__(message) class ApiError(Error): + def __init__(self, message='Unknown', code='Unknown'): self.message = message self.code = code |