Merge pull request #55434 from terminalmage/fix-slspath

Don't remove one directory level from slspath (master branch)
saltstack · Jan 5, 2020 · 5a17dd6 · 5a17dd6
2 parents e8b4f4d + aca3f33
commit 5a17dd6
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/salt/utils/templates.py b/salt/utils/templates.py
@@ -122,8 +122,6 @@ def render_tmpl(tmplsrc,
             slspath = context['sls'].replace('.', '/')
             if tmplpath is not None:
                 context['tplpath'] = tmplpath
-                if not tmplpath.lower().replace('\\', '/').endswith('/init.sls'):
-                    slspath = os.path.dirname(slspath)
                 template = tmplpath.replace('\\', '/')
                 i = template.rfind(slspath.replace('.', '/'))
                 if i != -1: