save

salt/utils/templates.py

@@ -64,6 +64,9 @@ def wrap_tmpl_func(render_str):
                 context['tplpath'] = tmplpath
                 if not tmplpath.lower().replace('\\', '/').endswith('/init.sls'):
                     slspath = os.path.dirname(slspath)
+            context['slspathdot'] = slspath.replace('/', '.')
+            if slspath:
+                slspath = slspath + '/'
             context['slspath'] = slspath
 
         if isinstance(tmplsrc, string_types):

tests/unit/stateconf_test.py

@@ -277,7 +277,7 @@ formula/woot.sls:
 ''', sls='formula.woot', argline='yaml . jinja')
 
         r = result['formula/woot.sls']['cmd.run'][0]['name']
-        self.assertEqual(r, 'echo formula/woot')
+        self.assertEqual(r, 'echo formula/woot/')
 
 
 if __name__ == '__main__':