From 3b4816b842f1dc3febe95df2b9ae25cfabc5a2df Mon Sep 17 00:00:00 2001 From: Brice Figureau Date: Mon, 23 Mar 2009 23:16:56 +0100 Subject: Fix #2101 - fix failing test 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 --- lib/puppet/network/handler/fileserver.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb index 86b0b5bb6..aad3b98be 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| -- cgit