diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-02-28 14:09:00 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-02-28 14:09:00 -0800 |
| commit | 7cf291944ad28532ccf31393e36ecf4bcd805868 (patch) | |
| tree | 88cb85621a460323145162f3cbc09a7f7fc0dff3 /lib/puppet | |
| parent | 721ace5007eb670651acb3b49f3e5b84a1a4f15c (diff) | |
| parent | 743e03930758d17ed35fc6b73f7c2c68d8212137 (diff) | |
| download | puppet-7cf291944ad28532ccf31393e36ecf4bcd805868.tar.gz puppet-7cf291944ad28532ccf31393e36ecf4bcd805868.tar.xz puppet-7cf291944ad28532ccf31393e36ecf4bcd805868.zip | |
Merge branch 'ticket/2.6.next/4922' into 2.6.next
Diffstat (limited to 'lib/puppet')
| -rwxr-xr-x | lib/puppet/type/file/content.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/puppet/type/file/content.rb b/lib/puppet/type/file/content.rb index 0e31f3099..5223ee333 100755 --- a/lib/puppet/type/file/content.rb +++ b/lib/puppet/type/file/content.rb @@ -194,7 +194,6 @@ module Puppet connection = Puppet::Network::HttpPool.http_instance(source_or_content.server, source_or_content.port) connection.request_get(indirection2uri(request), add_accept_encoding({"Accept" => "raw"})) do |response| case response.code - when "404"; nil when /^2/; uncompress(response) { |uncompressor| response.read_body { |chunk| yield uncompressor.uncompress(chunk) } } else # Raise the http error if we didn't get a 'success' of some kind. |