Merge pull request #39699 from techhat/httpshabang

Strip shabang line from rendered HTTP data
This commit is contained in:
Mike Place 2017-02-27 17:05:00 -07:00 committed by GitHub
commit 3940321462

View file

@ -762,7 +762,11 @@ def _render(template, render, renderer, template_dict, opts):
rend = salt.loader.render(opts, {})
blacklist = opts.get('renderer_blacklist')
whitelist = opts.get('renderer_whitelist')
return compile_template(template, rend, renderer, blacklist, whitelist, **template_dict)
ret = compile_template(template, rend, renderer, blacklist, whitelist, **template_dict)
ret = ret.read()
if str(ret).startswith('#!') and not str(ret).startswith('#!/'):
ret = str(ret).split('\n', 1)[1]
return ret
with salt.utils.fopen(template, 'r') as fh_:
return fh_.read()