diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2009-03-23 23:16:56 +0100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-03-27 00:05:52 +1100 |
| commit | 3b4816b842f1dc3febe95df2b9ae25cfabc5a2df (patch) | |
| tree | e80c6b2f5c82ceaea62caab2bcbd1bca3286d2a5 | |
| parent | f089e115fd126e2fae664322b7a27cb31f0efd3d (diff) | |
| download | puppet-3b4816b842f1dc3febe95df2b9ae25cfabc5a2df.tar.gz puppet-3b4816b842f1dc3febe95df2b9ae25cfabc5a2df.tar.xz puppet-3b4816b842f1dc3febe95df2b9ae25cfabc5a2df.zip | |
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 <brice-puppet@daysofwonder.com>
| -rwxr-xr-x | 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 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| |