saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Backporting fix for issue #25223 on 2015.2 branch

Browse source
This commit is contained in:
Nitin Madhok 2015-07-08 02:19:45 -04:00
parent 2bb09b7ee7
commit 391b7d6730
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/client/mixins.py
View file

@ -5,6 +5,7 @@ A collection of mixins useful for the various *Client interfaces
from __future__ import print_function
from __future__ import absolute_import
import collections
import copy
import logging
import traceback
import multiprocessing
@ -266,10 +267,12 @@ class SyncClientMixin(object):
try:
verify_fun(self.functions, fun)
# Inject some useful globals to *all* the funciton's global
# Inject some useful globals to *all* the function's global
# namespace only once per module-- not per func
completed_funcs = []
for mod_name in self.functions:
_functions = copy.deepcopy(self.functions)
for mod_name in _functions:
mod, _ = mod_name.split('.', 1)
if mod in completed_funcs:
continue