From cb59d41b2e3c4d96166cf10ab1076908f11e7b81 Mon Sep 17 00:00:00 2001 From: Ales Zoulek Date: Mon, 17 Dec 2012 22:12:15 +0100 Subject: [PATCH] Batch.run() should return minion name as - When using Batch.run() (or client.cmd_batch()) there was no way to tell from what minion the returned date came from. - Batch.run() returns a dictionary which has minion id as a key, and returned data as a value --- salt/cli/batch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/cli/batch.py b/salt/cli/batch.py index 3d82f83e92..67b78b3409 100644 --- a/salt/cli/batch.py +++ b/salt/cli/batch.py @@ -119,7 +119,7 @@ class Batch(object): pass for minion, data in parts.items(): active.remove(minion) - yield data['ret'] + yield {minion: data['ret']} ret[minion] = data['ret'] data[minion] = data.pop('ret') if 'out' in data: