From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 2 Mar 2011 12:02:50 +0000 (+0100)
Subject: I wonder if this is the right ruby syntax
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=228e425ba12bc870f8cb195c77b0d8e790187093;p=mirror%2Fdsa-puppet.git

I wonder if this is the right ruby syntax
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb
index 06b074d8d..11baf101b 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb
@@ -4,7 +4,7 @@ module Puppet::Parser::Functions
       required = args.shift.split()
       optional = args.shift.split()
 
-      allhosts = function_ldapinfo('*', required+optional )
+      allhosts = function_ldapinfo('*', *(required+optional) )
       res = {}
       allhosts.each_pair do |hostname, host|
           # If a returned value doesn't have all the attributes we're searching for, skip