From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 2 Mar 2011 17:59:07 +0000 (+0100)
Subject: Puppet not always reloading its functions is really really annoying
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8d4c37d69d3ba8a6c7b722aaa6bc11dc5e7b7d3e;p=mirror%2Fdsa-puppet.git

Puppet not always reloading its functions is really really annoying
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/getfromhash.rb b/modules/puppetmaster/lib/puppet/parser/functions/getfromhash.rb
index 6e50ba14e..69fdeb54e 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/getfromhash.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/getfromhash.rb
@@ -7,7 +7,7 @@ module Puppet::Parser::Functions
     # allows getting of hash[key] or even hash[key1][key2] etc.
     keys.each do |key|
       raise Puppet::ParseError, "argument[#{keys_done.join('][')}] is not a hash." unless x.kind_of?(Hash)
-      unless h.has_key?(key)
+      unless x.has_key?(key)
         x = false
         break
       end