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

Merge pull request #2607 from kjkuan/develop

Browse Source 
Fix the py renderer broken by the introduction of render pipes.
This commit is contained in:
Thomas S Hatch 2012-11-16 19:36:50 -08:00
commit 1b8889a16d
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/renderers/py.py
View File

@ -19,6 +19,7 @@ def render(template, env='', sls='', **kws):
:rtype: string
'''
template = kws['slspath']
if not os.path.isfile(template):
return {}

4
salt/renderers/stateconf.py
View File

@ -261,9 +261,7 @@ def render(template_file, env='', sls='', argline='', **kws):
name, rd_argline = (args[0] + ' ').split(' ', 1)
render_data = renderers[name] # eg, the yaml renderer
if ('-o', '') in opts:
if name == 'yaml' and (sys.version_info > (2, 6) or
(sys.version_info < (2, 7) and
HAS_ORDERED_DICT)):
if name == 'yaml':
IMPLICIT_REQUIRE = True
rd_argline = '-o ' + rd_argline
else:

5
salt/template.py
View File

@ -54,10 +54,9 @@ def compile_template(template, renderers, default, env='', sls=''):
input_data = StringIO(input_data)
for render, argline in render_pipe:
render_kwargs = dict(renderers=renderers, slspath=template)
if argline:
render_kwargs = dict(renderers=renderers, argline=argline)
else:
render_kwargs = dict(renderers=renderers)
render_kwargs['argline'] = argline
ret = render(input_data, env, sls, **render_kwargs)
if ret is None:
# The file is empty or is being written elsewhere