Fix broken batch results

Fixes #24875

a34b74a70c fixed the ValueError but caused results to be overwritten as if a minion did not return, when actually it did.
This commit is contained in:
Jason Woods 2015-06-30 11:09:20 +01:00
parent 46350796b6
commit 59b23e5f6e

View file

@ -157,8 +157,11 @@ class Batch(object):
continue
if self.opts.get('raw'):
parts.update({part['id']: part})
minion_tracker[queue]['minions'].remove(part['id'])
else:
parts.update(part)
for id in part.keys():
minion_tracker[queue]['minions'].remove(id)
except StopIteration:
# if a iterator is done:
# - set it to inactive