summaryrefslogtreecommitdiffstats
path: root/lib/puppet/file_serving/content.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-08-25 18:00:42 -0700
committerLuke Kanies <luke@madstop.com>2008-08-26 22:40:42 -0700
commit8b45d13ab28837caf3bb09cc1c90ab61974bf4db (patch)
treef249010d44605ec22db96130d280039a8882a672 /lib/puppet/file_serving/content.rb
parent6ed8dfaf7c0cf091dca0374de310f524b0a033cc (diff)
downloadpuppet-8b45d13ab28837caf3bb09cc1c90ab61974bf4db.tar.gz
puppet-8b45d13ab28837caf3bb09cc1c90ab61974bf4db.tar.xz
puppet-8b45d13ab28837caf3bb09cc1c90ab61974bf4db.zip
Adding automatic attribute collection to the new fileserving code.
Basically, this just includes a consistent method for collecting info (either content or metadata) and then calls that method when returning instances via the indirector. It's such a large commit mostly because of small changes in the normal code and large changes in the testing to accomodate those small changes. Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/file_serving/content.rb')
-rw-r--r--lib/puppet/file_serving/content.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/file_serving/content.rb b/lib/puppet/file_serving/content.rb
index 0f169c28b..c1ecff749 100644
--- a/lib/puppet/file_serving/content.rb
+++ b/lib/puppet/file_serving/content.rb
@@ -28,6 +28,7 @@ class Puppet::FileServing::Content < Puppet::FileServing::Base
# Collect our data.
def collect
+ return if stat.ftype == "directory"
content
end