From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 2 Mar 2011 18:22:50 +0000 (+0100)
Subject: syntax fixes
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=e95028666f1ef429d608c1c70539637f4861d032

syntax fixes
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index edcee48d..27888cec 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -34,17 +34,19 @@ module Puppet::Parser::Functions
 
     if not nodeinfo['hoster']['nameservers'] or nodeinfo['hoster']['nameservers'].empty?
       # no nameservers known for this hoster
+      nodeinfo['misc']['resolver-recursive'] = true
+
       if nodeinfo['hoster']['allow_dns_query']
-        raise Puppet::ParseError, "No nameservers listed for #{(nodeinfo['hoster']['name']} yet we should answer somebody's queries?  That makes no sense."
+        raise Puppet::ParseError, "No nameservers listed for #{nodeinfo['hoster']['name']} yet we should answer somebody's queries?  That makes no sense."
       end
-      nodeinfo['misc']['resolver-recursive'] = true
     elsif (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v4addrs']).size > 0 or
           (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v6addrs']).size > 0
       # this host is listed as a nameserver at this location
+      nodeinfo['misc']['resolver-recursive'] = true
+
       if not nodeinfo['hoster']['allow_dns_query'] or nodeinfo['hoster']['allow_dns_query'].empty?
-        raise Puppet::ParseError, "Host #{host} is listed as a nameserver for #{(nodeinfo['hoster']['name']} but no allow_dns_query networks are defined for this location"
+        raise Puppet::ParseError, "Host #{host} is listed as a nameserver for #{nodeinfo['hoster']['name']} but no allow_dns_query networks are defined for this location"
       end
-      nodeinfo['misc']['resolver-recursive'] = true
     else
       nodeinfo['misc']['resolver-recursive'] = false
     end