Merge pull request #470 from Yelp/getvar_future_parser

Also catch :undefined_variable as thrown by future parser
2015-06-11 18:23:29 +01:00 · 2015-06-11 18:23:29 +01:00 · 8267dbc149
commit 8267dbc149
parent 0191a3fb77 212c498df3
1 changed files with 3 additions and 1 deletions
--- 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