chutzpah 14/06/19 01:34:13 Added: salt-2014.1.5-minion-error.patch Log: Revision bump, fix problem starting the minion in certain setups. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
Revision Changes Path 1.1 app-admin/salt/files/salt-2014.1.5-minion-error.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/files/salt-2014.1.5-minion-error.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/files/salt-2014.1.5-minion-error.patch?rev=1.1&content-type=text/plain Index: salt-2014.1.5-minion-error.patch =================================================================== diff --git a/salt/minion.py b/salt/minion.py index 47a23de..52a5849 100644 --- a/salt/minion.py +++ b/salt/minion.py @@ -461,8 +461,10 @@ class MultiMinion(object): while True: for minion in minions.values(): - if isinstance(minion, dict): + if isinstance(minion, dict) and 'minion' in minion: minion = minion['minion'] + elif isinstance(minion, dict): + continue if not hasattr(minion, 'schedule'): continue try:
