fc16e6ca2c
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=132
53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
From 3be2bb0043f15af468f1db33b1aa1cc6f2e5797d Mon Sep 17 00:00:00 2001
|
|
From: Bo Maryniuk <bo@suse.de>
|
|
Date: Wed, 9 Jan 2019 16:08:19 +0100
|
|
Subject: [PATCH] Fix issue #2068 test
|
|
|
|
Skip injecting `__call__` if chunk is not dict.
|
|
|
|
This also fixes `integration/modules/test_state.py:StateModuleTest.test_exclude` that tests `include` and `exclude` state directives containing the only list of strings.
|
|
|
|
Minor update: more correct is-dict check.
|
|
---
|
|
salt/state.py | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/salt/state.py b/salt/state.py
|
|
index 91985c8edc..01ec1faf8b 100644
|
|
--- a/salt/state.py
|
|
+++ b/salt/state.py
|
|
@@ -25,6 +25,7 @@ import traceback
|
|
import re
|
|
import time
|
|
import random
|
|
+import collections
|
|
|
|
# Import salt libs
|
|
import salt.loader
|
|
@@ -2776,16 +2777,18 @@ class State(object):
|
|
'''
|
|
for chunk in high:
|
|
state = high[chunk]
|
|
+ if not isinstance(state, collections.Mapping):
|
|
+ continue
|
|
for state_ref in state:
|
|
needs_default = True
|
|
+ if not isinstance(state[state_ref], list):
|
|
+ continue
|
|
for argset in state[state_ref]:
|
|
if isinstance(argset, six.string_types):
|
|
needs_default = False
|
|
break
|
|
if needs_default:
|
|
- order = state[state_ref].pop(-1)
|
|
- state[state_ref].append('__call__')
|
|
- state[state_ref].append(order)
|
|
+ state[state_ref].insert(-1, '__call__')
|
|
|
|
def call_high(self, high, orchestration_jid=None):
|
|
'''
|
|
--
|
|
2.20.1
|
|
|
|
|