summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-09-03 03:03:23 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-09-03 03:03:23 +0000
commitc626796754a1b20b1152a0382b985986a5e1fb30 (patch)
treec0eab9ff16126d2cd929e214cddc4fe4ab8f67bb /lib/puppet/parser
parenta11505035c62ce850cd49648bda1f25c811674c4 (diff)
downloadpuppet-c626796754a1b20b1152a0382b985986a5e1fb30.tar.gz
puppet-c626796754a1b20b1152a0382b985986a5e1fb30.tar.xz
puppet-c626796754a1b20b1152a0382b985986a5e1fb30.zip
Adding eat-last-line support in ERB
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1542 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser')
-rw-r--r--lib/puppet/parser/scope.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb
index 2021ec0f1..69c8c06ed 100644
--- a/lib/puppet/parser/scope.rb
+++ b/lib/puppet/parser/scope.rb
@@ -50,7 +50,7 @@ module Puppet::Parser
def result
result = nil
benchmark(:debug, "Interpolated template #{@file}") do
- template = ERB.new(File.read(@file))
+ template = ERB.new(File.read(@file), 0, "-")
result = template.result(binding)
end