summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorBrice Figureau <brice-puppet@daysofwonder.com>2009-11-14 16:21:05 +0100
committerJames Turnbull <james@lovedthanlost.net>2009-11-17 07:29:33 +1100
commit55d8ffaaa3052dd0e8e2915d974d99827a92d61e (patch)
tree4d9b3d078f5bc1dd739a4c942ef1aa052365c8d9 /lib/puppet
parent236bacc0a2c858ec25a48984e25834b91efc01c5 (diff)
downloadpuppet-55d8ffaaa3052dd0e8e2915d974d99827a92d61e.tar.gz
puppet-55d8ffaaa3052dd0e8e2915d974d99827a92d61e.tar.xz
puppet-55d8ffaaa3052dd0e8e2915d974d99827a92d61e.zip
Fix #2810 - adapt tidy to new FileSet api
In #1469 we changed the FileSet internal api and missed that tidy was still using the old version. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet')
-rwxr-xr-xlib/puppet/type/tidy.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/puppet/type/tidy.rb b/lib/puppet/type/tidy.rb
index f45171d90..b5ccb3fb1 100755
--- a/lib/puppet/type/tidy.rb
+++ b/lib/puppet/type/tidy.rb
@@ -247,8 +247,15 @@ Puppet::Type.newtype(:tidy) do
def generate
return [] unless stat(self[:path])
- if self[:recurse]
- files = Puppet::FileServing::Fileset.new(self[:path], :recurse => self[:recurse]).files.collect do |f|
+ case self[:recurse]
+ when Integer, Fixnum, Bignum, /^\d+$/
+ parameter = { :recurse => true, :recurselimit => self[:recurse] }
+ when true, :true, :inf
+ parameter = { :recurse => true }
+ end
+
+ if parameter
+ files = Puppet::FileServing::Fileset.new(self[:path], parameter).files.collect do |f|
f == "." ? self[:path] : File.join(self[:path], f)
end
else