Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[BUGFIX] template errors can hit an exception path that references an…

… undefined variable
  • Loading branch information...
commit 7f0810a55fe219999b68a0fae9fb8f76d3bfe71b 1 parent 9789188
@jimi-c jimi-c authored
Showing with 2 additions and 7 deletions.
  1. +2 −7 cobbler/templar.py
View
9 cobbler/templar.py
@@ -150,7 +150,6 @@ def render_cheetah(self, raw_data, search_table, subject=None):
Render data_input back into a file.
data_input is either a string or a filename
search_table is a hash of metadata keys and values
- out_path if not-none writes the results to a file
(though results are always returned)
subject is a profile or system object, if available (for snippet eval)
"""
@@ -205,12 +204,8 @@ def render_cheetah(self, raw_data, search_table, subject=None):
data_out = t.respond()
self.last_errors = t.errorCatcher().listErrors()
except Exception, e:
- if out_path is None:
- return utils.cheetah_exc(e)
- else:
- # FIXME: log this
- self.logger.error(utils.cheetah_exc(e))
- raise CX("Error templating file: %s" % out_path)
+ self.logger.error(utils.cheetah_exc(e))
+ raise CX("Error templating file, check cobbler.log for more details")
return data_out
Please sign in to comment.
Something went wrong with that request. Please try again.