summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-03-11 21:15:18 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-03-11 21:15:18 +0000
commit872892036ca8ca1b2ed503dbedd6b18f33f52abd (patch)
treef184ce4f5fb0d7482f8ab2491d7bb769b977d104 /lib/puppet
parent4ee395b28fa0e25372494e557ba0fc6d46fc6a1c (diff)
downloadpuppet-872892036ca8ca1b2ed503dbedd6b18f33f52abd.tar.gz
puppet-872892036ca8ca1b2ed503dbedd6b18f33f52abd.tar.xz
puppet-872892036ca8ca1b2ed503dbedd6b18f33f52abd.zip
Using undefined variables is no longer an exception, it just returns an empty string.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1003 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/parser/scope.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb
index f247bd7b8..76fb1703e 100644
--- a/lib/puppet/parser/scope.rb
+++ b/lib/puppet/parser/scope.rb
@@ -676,10 +676,11 @@ module Puppet
#Puppet.debug "Looking up variable %s" % name
value = self.lookup("variable", name)
if value == :undefined
- error = Puppet::ParseError.new(
- "Undefined variable '%s'" % name
- )
- raise error
+ return ""
+ #error = Puppet::ParseError.new(
+ # "Undefined variable '%s'" % name
+ #)
+ #raise error
else
return value
end