diff options
Diffstat (limited to 'lib/puppet/file_serving')
| -rw-r--r-- | lib/puppet/file_serving/content.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/puppet/file_serving/content.rb b/lib/puppet/file_serving/content.rb index 9fc1d08b3..87ef4fbbf 100644 --- a/lib/puppet/file_serving/content.rb +++ b/lib/puppet/file_serving/content.rb @@ -26,10 +26,11 @@ class Puppet::FileServing::Content < Puppet::FileServing::Base instance end - # Collect our data. + # BF: we used to fetch the file content here, but this is counter-productive + # for puppetmaster streaming of file content. So collect just returns itself def collect return if stat.ftype == "directory" - content + self end # Read the content of our file in. @@ -44,6 +45,6 @@ class Puppet::FileServing::Content < Puppet::FileServing::Base end def to_raw - content + File.new(full_path(), "r") end end |