valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
steve 2014-08-14 09:43:54 -04:00
parent 53fed2cc63
commit 091c40df21
2 changed files with 4 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

@ -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):

2
tests/unit/stateconf_test.py
View File

@ -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__':