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

Merge branch 'develop' of github.com:saltstack/salt into develop

Browse Source
This commit is contained in:
Thomas S Hatch 2012-03-02 00:23:02 -07:00
commit 3501ec11b1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/state.py
View File

@ -552,14 +552,19 @@ class State(object):
Take the path to a template and return the high data structure
derived from the template.
'''
# Template was specified incorrectly
if not isinstance(template, basestring):
return {}
# No highstate data from invalid or empty files
# Template does not exists
if not os.path.isfile(template):
return {}
# Template is an empty file
if salt.utils.is_empty(template):
return {}
# Template is nothing but whitespace
if not open(template).read().strip():
return {}
return self.rend[self.template_shebang(template)](template, env, sls)
def compile_template_str(self, template):