File 0057-fix-salt-summary-to-count-not-responding-minions-cor.patch of Package salt.3314

From a8e6dbf34e6efefaf3885d75f5e1aa657f5a0496 Mon Sep 17 00:00:00 2001
From: Michael Calmer <mc@suse.de>
Date: Tue, 21 Jun 2016 13:12:48 +0200
Subject: [PATCH 57/57] fix salt --summary to count not responding minions
 correctly (bsc#972311)

In case a minion is not responding a dict is returned instead of a string.
---
 salt/cli/salt.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/salt/cli/salt.py b/salt/cli/salt.py
index c801647..d7dbb3b 100644
--- a/salt/cli/salt.py
+++ b/salt/cli/salt.py
@@ -246,6 +246,8 @@ class SaltCMD(parsers.SaltCMDOptionParser):
         not_connected_minions = []
         for each_minion in ret:
             minion_ret = ret[each_minion]
+            if (isinstance(minion_ret, dict) and 'ret' in minion_ret):
+                minion_ret = ret[each_minion].get('ret')
             if (
                     isinstance(minion_ret, string_types)
                     and minion_ret.startswith("Minion did not return")
-- 
2.1.4

openSUSE Build Service is sponsored by