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 4

Avoid circular imports on mac os

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-02-27 02:20:04 -07:00
parent 823886028b
commit 9a35eb712a
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/utils/templates.py
View file

@ -29,7 +29,6 @@ import salt.utils.yamlencoding
from salt import __path__ as saltpath
from salt.exceptions import CommandExecutionError, SaltInvocationError, SaltRenderError
from salt.loader.context import NamedLoaderContext
from salt.loader.dunder import __file_client__
from salt.utils.decorators.jinja import JinjaFilter, JinjaGlobal, JinjaTest
from salt.utils.odict import OrderedDict
from salt.utils.versions import Version
@ -358,6 +357,8 @@ def render_jinja_tmpl(tmplstr, context, tmplpath=None):
if tmplpath:
loader = jinja2.FileSystemLoader(os.path.dirname(tmplpath))
else:
from salt.loader.dunder import __file_client__
loader = salt.utils.jinja.SaltCacheLoader(
opts,
saltenv,