Merge pull request #470 from Yelp/getvar_future_parser

Also catch :undefined_variable as thrown by future parser
xbezdick · Jun 11, 2015 · 8267dbc · 8267dbc
2 parents 0191a3f + 212c498
commit 8267dbc
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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