summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-10-23 01:19:07 +0200
committerLuke Kanies <luke@madstop.com>2008-10-23 01:19:07 +0200
commit23d42aca2260562b951507f8a0382823619c19d7 (patch)
tree0319dbc38b37bbd3b6f8bc43f34b2cc6bb3939f2 /lib/puppet/parser
parentb7d72360f66e36d897cfd4436236a3607a6de5b7 (diff)
parent22024bce8f47ea37d57e57dd25d42b8a1996693c (diff)
downloadpuppet-23d42aca2260562b951507f8a0382823619c19d7.tar.gz
puppet-23d42aca2260562b951507f8a0382823619c19d7.tar.xz
puppet-23d42aca2260562b951507f8a0382823619c19d7.zip
Merge branch '0.24.x' of git://github.com/jamtur01/puppet into 0.24.x
Diffstat (limited to 'lib/puppet/parser')
-rw-r--r--lib/puppet/parser/templatewrapper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/parser/templatewrapper.rb b/lib/puppet/parser/templatewrapper.rb
index 00f364088..036f6604e 100644
--- a/lib/puppet/parser/templatewrapper.rb
+++ b/lib/puppet/parser/templatewrapper.rb
@@ -83,7 +83,11 @@ class Puppet::Parser::TemplateWrapper
# to the regular methods.
benchmark(:debug, "Bound template variables for #{file}") do
scope.to_hash.each { |name, value|
- realname = name.gsub(/[^\w]/, "_")
+ if name.kind_of?(String)
+ realname = name.gsub(/[^\w]/, "_")
+ else
+ realname = name
+ end
instance_variable_set("@#{realname}", value)
}
end