Merge pull request #674 from DavidS/modules-3969-fix-getvar-for-187

(MODULES-3969) Update getvar to work on ruby 1.8.7

2 files changed, 12 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9f79f6..9157b2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,13 @@ This bugfix release addresses the `undefined method 'optional_repeated_param'` e
 
 It also improves the user experience around function deprecations by emitting one warning per function(-name) instead of only one deprecation overall. This allows users to identify all deprecated functions used in one agent run, with less back-and-forth.
 
-Finally, this release adds additional Puppet 4 overrides for the `is_` counterparts of the deprecated functions to emit the deprecations warnings in all cases.
+#### Bugfixes
+
+* Emit deprecations warnings for each function, instead of once per process. (MODULES-3961)
+* Use a universally available API for the v4 deprecation stubs of `is_*` and `validate_*`. (MODULES-3962)
+* Make `getvar()` compatible to ruby 1.8.7. (MODULES-3969)
+* Add v4 deprecation stubs for the `is_` counterparts of the deprecated functions to emit the deprecations warnings in all cases.
+
 
 ## Supported Release 4.13.0
 ### Summary
diff --git a/lib/puppet/parser/functions/getvar.rb b/lib/puppet/parser/functions/getvar.rb
index aa6edbb..3af8d48 100644
--- a/lib/puppet/parser/functions/getvar.rb
+++ b/lib/puppet/parser/functions/getvar.rb
@@ -20,11 +20,13 @@ module Puppet::Parser::Functions
     end
 
     begin
+      result = nil
       catch(:undefined_variable) do
-        return self.lookupvar("#{args[0]}")
+        result = self.lookupvar("#{args[0]}")
       end
-      
-      nil # throw was caught
+
+      # avoid relying on incosistent behaviour around ruby return values from catch
+      result
     rescue Puppet::ParseError # Eat the exception if strict_variables = true is set
     end