diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-08-20 13:46:11 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-08-20 13:46:11 -0400 |
| commit | 8ae8641073ac352b3781a3d6a592bd5ca6d1b15c (patch) | |
| tree | a5bfa9d745d873d4b04e240422d970182ea9ee4f /cobbler | |
| parent | ac871f8a4192389c3d206e5120e2d6c22630dbc2 (diff) | |
| download | cobbler-8ae8641073ac352b3781a3d6a592bd5ca6d1b15c.tar.gz cobbler-8ae8641073ac352b3781a3d6a592bd5ca6d1b15c.tar.xz cobbler-8ae8641073ac352b3781a3d6a592bd5ca6d1b15c.zip | |
more error catcher fixing
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/templar.py | 2 | ||||
| -rw-r--r-- | cobbler/template_api.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cobbler/templar.py b/cobbler/templar.py index f0ec4ce2..c5258ade 100644 --- a/cobbler/templar.py +++ b/cobbler/templar.py @@ -79,7 +79,7 @@ class Templar: raw_data = newdata # tell Cheetah not to blow up if it can't find a symbol for something - # raw_data = "#errorCatcher Echo\n" + raw_data + raw_data = "#errorCatcher Echo\n" + raw_data # now do full templating scan, where we will also templatify the snippet insertions t = Template(source=raw_data, errorCatcher="Echo", searchList=[search_table]) diff --git a/cobbler/template_api.py b/cobbler/template_api.py index ac2eeccd..e6a4b2ab 100644 --- a/cobbler/template_api.py +++ b/cobbler/template_api.py @@ -242,7 +242,7 @@ class Template(BuiltinTemplate): if isinstance(file, (str, unicode)): if os.path.exists(file): f = open(file) - source = "#errorCatcher Echo" + f.read() + source = "#errorCatcher Echo\n" + f.read() f.close() else: source = "# Unable to read %s\n" % file |