]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Try && instead of and
authorPeter Palfrader <peter@palfrader.org>
Wed, 16 May 2012 11:23:17 +0000 (13:23 +0200)
committerPeter Palfrader <peter@palfrader.org>
Wed, 16 May 2012 11:23:17 +0000 (13:23 +0200)
modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb

index 63c6fcaf5c5f01b4c526f797d8db5b036c650ea2..fd61919ed5f5d6d21d6f0dd2f2db0b905647e5fe 100644 (file)
@@ -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']