summaryrefslogtreecommitdiffstats
path: root/nova/process.py
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2010-07-30 12:13:20 -0700
committerJustin Santa Barbara <justin@fathomdb.com>2010-07-30 12:13:20 -0700
commit9b6f4346b575d9a20d94293e9352a7c09a8d2a7a (patch)
treea528fb64fc2be518f757fa0bfa5ae364fb8d8b4d /nova/process.py
parent3897047a2c0f8906c99418ddad6e2c68f0dec5c7 (diff)
parent1db9c94a78bcbefaaa59ee5ee0de4efe5fc1c790 (diff)
downloadnova-9b6f4346b575d9a20d94293e9352a7c09a8d2a7a.tar.gz
nova-9b6f4346b575d9a20d94293e9352a7c09a8d2a7a.tar.xz
nova-9b6f4346b575d9a20d94293e9352a7c09a8d2a7a.zip
Merged with trunk, added note about suspicious behaviour
Diffstat (limited to 'nova/process.py')
-rw-r--r--nova/process.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/process.py b/nova/process.py
index 24ea3eb7f..9e9de2ee8 100644
--- a/nova/process.py
+++ b/nova/process.py
@@ -107,6 +107,9 @@ class BackRelayWithInput(protocol.ProcessProtocol):
reason.trap(error.ProcessDone)
self.deferred.callback((stdout, stderr))
except:
+ # This logic is a little suspicious to me (justinsb)...
+ # If the callback throws an exception, then errback will be called also.
+ # However, this is what the unit tests test for...
self.deferred.errback(UnexpectedErrorOutput(stdout, stderr))
elif self.onProcessEnded is not None:
self.onProcessEnded.errback(reason)