Way more painful than is legal

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
index d0321846e29967b2b2a9f175e881e33148f943e4..84b618c3e6f93c05afe172e6bd800a58c2751f7a 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
@@ -17,7 +17,7 @@ module Puppet::Parser::Functions
         yaml.keys.each do |hoster|
           if yaml[hoster].kind_of?(Array)
             netrange = yaml[hoster]
-          elsif yaml[hoster].kind_of?(Array) and yaml[hoster].has_key?['netrange']
+          elsif yaml[hoster].kind_of?(Hash) and yaml[hoster].has_key?('netrange')
             netrange = yaml[hoster]['netrange']
           else
             next
@@ -25,10 +25,10 @@ module Puppet::Parser::Functions
           netrange.each do |net|
             begin
               if IPAddr.new(net).include?(addr)
-                return hoster
+                ans = hoster
               end
-            rescue
-              raise "Could not match addr #{addr} for net #{net}"
+            rescue Exception => e
+              raise "Error while trying to match addr #{addr} for net #{net}: #{e.message}\n#{e.backtrace}"
             end
           end
         end