X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fwhohosts.rb;h=b55204ac8fdd17712ae920f509c864288301d088;hb=1fb1e088994c071cb659b10b8d4aaafbda70fbf6;hp=20f83d367851f75ad07ad9ba6f957eaaff82038b;hpb=7fbd1fb63f9a8e87683b183e8b39bce18af59a4a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
index 20f83d367..b55204ac8 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
@@ -5,6 +5,7 @@ module Puppet::Parser::Functions
 
     ipAddrs = args[0]
     yamlfile = args[1]
+    parser = Puppet::Parser::Parser.new(environment)
     parser.watch_file(yamlfile)
 
     $KCODE = 'utf-8'
@@ -14,11 +15,8 @@ module Puppet::Parser::Functions
 
     ipAddrs.each do |addr|
       yaml.keys.each do |hoster|
-        if yaml[hoster].kind_of?(Hash) and yaml[hoster].has_key?('netrange')
-          netrange = yaml[hoster]['netrange']
-        else
-          next
-        end
+        next unless yaml[hoster].kind_of?(Hash) and yaml[hoster].has_key?('netrange')
+        netrange = yaml[hoster]['netrange']
 
         netrange.each do |net|
           begin
@@ -32,6 +30,9 @@ module Puppet::Parser::Functions
         end
       end
     end
+    if not ans['longname']
+      ans['longname'] = ans['name']
+    end
     return ans
   end
 end