diff options
| -rw-r--r-- | lib/puppet/parser/scope.rb | 9 | ||||
| -rwxr-xr-x | test/language/scope.rb | 6 |
2 files changed, 9 insertions, 6 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 diff --git a/test/language/scope.rb b/test/language/scope.rb index 9c5302988..06d244543 100755 --- a/test/language/scope.rb +++ b/test/language/scope.rb @@ -88,9 +88,11 @@ class TestScope < Test::Unit::TestCase # verify that they aren't available in upper scopes if parent = s.parent - assert_raise(Puppet::ParseError) { - parent.lookupvar(v) + val = nil + assert_nothing_raised { + val = parent.lookupvar(v) } + assert_equal("", val, "Did not get empty string on missing var") # and verify that the parent sees its correct value assert_equal(ovalues[i - 1],parent.lookupvar(over)) |