ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/259664
Change subject: jessie 2014.7.5 patch for batch cli returns with broken dict ...................................................................... jessie 2014.7.5 patch for batch cli returns with broken dict Change-Id: Ic41c5dfc42729622c0c869a5bfdb0dda484da4b2 --- A debian/patches/batch_returns_bad_dict_WMF.patch M debian/patches/series 2 files changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/salt refs/changes/64/259664/1 diff --git a/debian/patches/batch_returns_bad_dict_WMF.patch b/debian/patches/batch_returns_bad_dict_WMF.patch new file mode 100644 index 0000000..b7af934 --- /dev/null +++ b/debian/patches/batch_returns_bad_dict_WMF.patch @@ -0,0 +1,28 @@ +Description: Fix minion job returns handling for batches +Bug: https://github.com/saltstack/salt/issues/23047 +Author: Ariel T. Glenn <[email protected]> +Forwarded: yes +Applied-Upstream: https://github.com/saltstack/salt/commit/b351af042d94f2f4a693a69655134b61400f3de6 +--- a/salt/cli/batch.py ++++ b/salt/cli/batch.py +@@ -135,12 +135,14 @@ + parts = {} + + # see if we found more minions +- for ping_ret in self.ping_gen: +- if ping_ret is None: +- break +- if ping_ret not in self.minions: +- self.minions.append(ping_ret) +- to_run.append(ping_ret) ++ if self.ping_gen is not None: ++ for ping_ret in self.ping_gen: ++ if ping_ret is None: ++ break ++ for minion_name in ping_ret.keys(): ++ if minion_name not in self.minions: ++ self.minions.append(minion_name) ++ to_run.append(minion_name) + + for queue in iters: + try: diff --git a/debian/patches/series b/debian/patches/series index ad0861c..ac37b55 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ fix_2014.1.6_releasenotes missing_locale_dir make-log-file-group-readable.patch +batch_returns_bad_dict_WMF.patch -- To view, visit https://gerrit.wikimedia.org/r/259664 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic41c5dfc42729622c0c869a5bfdb0dda484da4b2 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/salt Gerrit-Branch: jessie Gerrit-Owner: ArielGlenn <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
