Also catch :undefined_variable as thrown by future parser

diff --git a/lib/puppet/parser/functions/getvar.rb b/lib/puppet/parser/functions/getvar.rb
index fb336b6aca070932b015d96fbb97abdea61a6607..ae9c869d1ca6962128fa2e4b25be1983f242a569 100644 (file)
--- a/lib/puppet/parser/functions/getvar.rb
+++ b/lib/puppet/parser/functions/getvar.rb
@@ -20,7 +20,9 @@ module Puppet::Parser::Functions
     end
 
     begin
-      self.lookupvar("#{args[0]}")
+      catch(:undefined_variable) do
+        self.lookupvar("#{args[0]}")
+      end
     rescue Puppet::ParseError # Eat the exception if strict_variables = true is set
     end