This code hasn't been modified since the introduction of the
fileset recurselimit parameter. Tests depending on this code
were failing.

Signed-off-by: Brice Figureau <[email protected]>
---
 lib/puppet/network/handler/fileserver.rb |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/lib/puppet/network/handler/fileserver.rb 
b/lib/puppet/network/handler/fileserver.rb
index 86b0b5b..aad3b98 100755
--- a/lib/puppet/network/handler/fileserver.rb
+++ b/lib/puppet/network/handler/fileserver.rb
@@ -672,7 +672,11 @@ class Puppet::Network::Handler
             def reclist(abspath, recurse, ignore)
                 require 'puppet/file_serving'
                 require 'puppet/file_serving/fileset'
-                args = { :recurse => recurse, :links => :follow }
+                if recurse.is_a?(Fixnum)
+                    args = { :recurse => true, :recurselimit => recurse, 
:links => :follow }
+                else
+                    args = { :recurse => recurse, :links => :follow }
+                end
                 args[:ignore] = ignore if ignore
                 fs = Puppet::FileServing::Fileset.new(abspath, args)
                 ary = fs.files.collect do |file|
-- 
1.6.0.2


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to