14ef6d2b51
- splitting out the susemanager integration plugins into their own subpackages. ATM this only contains the zypp plugin to tell susemanager about manually installed packages. - Unit and integration tests fixes for 2016.3.2 Add: * 0018-Unit-tests-fixes-for-2016.3.2.patch * 0019-Fix-snapper_test-for-python26.patch * 0020-Integration-tests-fixes-for-2016.3.2.patch - Prevent pkg.install failure for expired keys (bsc#996455) Add: * 0017-Check-for-single-quote-before-splitting-on-single-qu.patch - Required D-Bus and generating machine ID where it is missing - Fix sphinx crashes when documentation is being generated Add script for documentation update. Add: * 0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch * update-documentation.sh - Fix pkg.installed refresh repo failure (bsc#993549) Fix salt.states.pkgrepo.management no change failure (bsc#990440) Add: * 0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch * 0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch - Deprecate status.uptime one version later Add: OBS-URL: https://build.opensuse.org/request/show/430691 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=77
30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
From e3969a80bdf2d0af0c87463af859d8daf314f018 Mon Sep 17 00:00:00 2001
|
|
From: Michael Calmer <mc@suse.de>
|
|
Date: Tue, 21 Jun 2016 13:12:48 +0200
|
|
Subject: [PATCH 11/12] 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 | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/cli/salt.py b/salt/cli/salt.py
|
|
index baeaf23..ec18f2e 100644
|
|
--- a/salt/cli/salt.py
|
|
+++ b/salt/cli/salt.py
|
|
@@ -264,7 +264,9 @@ class SaltCMD(parsers.SaltCMDOptionParser):
|
|
not_connected_minions = []
|
|
failed_minions = []
|
|
for each_minion in ret:
|
|
- minion_ret = ret[each_minion].get('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.9.2
|
|
|