diff options
| -rwxr-xr-x | lib/puppet/type/file/content.rb | 6 | ||||
| -rwxr-xr-x | spec/unit/type/file/content_spec.rb | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/puppet/type/file/content.rb b/lib/puppet/type/file/content.rb index f5b65d3fd..b8f30a9c7 100755 --- a/lib/puppet/type/file/content.rb +++ b/lib/puppet/type/file/content.rb @@ -161,12 +161,16 @@ module Puppet } end + def self.standalone? + Puppet.settings[:name] == "apply" + end + def each_chunk_from(source_or_content) if source_or_content.is_a?(String) yield source_or_content elsif source_or_content.nil? yield read_file_from_filebucket - elsif Puppet.settings[:name] == "apply" + elsif self.class.standalone? yield source_or_content.content elsif source_or_content.local? chunk_file_from_disk(source_or_content) { |chunk| yield chunk } diff --git a/spec/unit/type/file/content_spec.rb b/spec/unit/type/file/content_spec.rb index a01a14a59..cde643fc8 100755 --- a/spec/unit/type/file/content_spec.rb +++ b/spec/unit/type/file/content_spec.rb @@ -6,6 +6,7 @@ content = Puppet::Type.type(:file).attrclass(:content) describe content do before do @resource = Puppet::Type.type(:file).new :path => "/foo/bar" + content.stubs(:standalone?).returns(false) end it "should be a subclass of Property" do |