Permalink
Browse files

Merge branch '1.4'

  • Loading branch information...
2 parents 3dc92e3 + 9f0ff89 commit e005cb633a6264da022a45dc9f3469577af84db2 @bitprophet bitprophet committed Jul 27, 2012
Showing with 4 additions and 0 deletions.
  1. +3 −0 docs/changelog.rst
  2. +1 −0 fabric/job_queue.py
View
@@ -25,6 +25,9 @@ would have also been included in the 1.2 line.
Changelog
=========
+* :bug:`693` Fixed edge case where ``abort`` driven failures within parallel
+ tasks could result in a top level exception (a ``KeyError``) regarding error
+ handling. Thanks to Marcin Kuźmiński for the report.
* :support:`681` Fixed outdated docstring for `~fabric.decorators.runs_once`
which claimed it would get run multiple times in parallel mode. That behavior
was fixed in an earlier release but the docs were not updated. Thanks to
View
@@ -160,6 +160,7 @@ def _advance_the_queue():
for job in self._completed:
results[job.name] = {
'exit_code': job.exitcode,
+ 'results': None # In case of SystemExit/etc in parallel subprocess
}
while True:
try:

0 comments on commit e005cb6

Please sign in to comment.