[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5-303-gfcfa26a

[Nick Lewis]

The following commit has been merged in the upstream branch:
commit 7cf291944ad28532ccf31393e36ecf4bcd805868
Merge: 721ace5007eb670651acb3b49f3e5b84a1a4f15c 743e03930758d17ed35fc6b73f7c2c68d8212137
Author: Nick Lewis <nick at puppetlabs.com>
Date:   Mon Feb 28 14:09:00 2011 -0800

    Merge branch 'ticket/2.6.next/4922' into 2.6.next

diff --combined lib/puppet/type/file/content.rb
index 0e31f30,1b36acb..5223ee3
--- a/lib/puppet/type/file/content.rb
+++ b/lib/puppet/type/file/content.rb
@@@ -17,19 -17,19 +17,19 @@@ module Puppe
  
      desc "Specify the contents of a file as a string.  Newlines, tabs, and
        spaces can be specified using the escaped syntax (e.g., \\n for a newline).  The primary purpose of this parameter is to provide a
 -      kind of limited templating::
 -
 -        define resolve(nameserver1, nameserver2, domain, search) {
 -          $str = \"search $search
 -        domain $domain
 -        nameserver $nameserver1
 -        nameserver $nameserver2
 -        \"
 -
 -          file { \"/etc/resolv.conf\":
 -            content => $str
 +      kind of limited templating:
 +
 +          define resolve(nameserver1, nameserver2, domain, search) {
 +              $str = \"search $search
 +                  domain $domain
 +                  nameserver $nameserver1
 +                  nameserver $nameserver2
 +                  \"
 +
 +              file { \"/etc/resolv.conf\":
 +                content => $str
 +              }
            }
 -        }
  
        This attribute is especially useful when used with templating."
  
@@@ -194,7 -194,6 +194,6 @@@
        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.

-- 
Puppet packaging for Debian