From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 16 May 2012 11:23:17 +0000 (+0200)
Subject: Try && instead of and
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=39a6242f65a01a1fb9693278be69b12460ac015f;p=mirror%2Fdsa-puppet.git

Try && instead of and
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index 63c6fcaf5..fd61919ed 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -13,7 +13,7 @@ module Puppet::Parser::Functions
         raise Puppet::ParseError, "Host #{host} does not have ipHostNumber values in ldap"
       end
       nodeinfo['hoster'] = function_whohosts(nodeinfo['ldap']['ipHostNumber'], "/etc/puppet/modules/debian-org/misc/hoster.yaml")
-      nodeinfo['buildd'] = nodeinfo['ldap']['purpose'] and nodeinfo['ldap']['purpose'].include?('buildd')
+      nodeinfo['buildd'] = nodeinfo['ldap']['purpose'] && nodeinfo['ldap']['purpose'].include?('buildd')
 
       if lookupvar('::mta') == 'exim4'
         unless nodeinfo['heavy_exim']