[Pkg-puppet-devel] Bug#593125: 2.6.0 produces empty files on client - this fixes it for me

[Sven Mueller]

Package: puppetmaster
Version: 2.6.0-4
Severity: normal
Tags: patch


The attached patch to the _client_ side fixes the issue for me.
This is from upstream bug 4319 (first patch, the second one you
already integrated).

As far as I know, upstream 2.6.1 has this, but the fix should also
go into the version you have in squeeze anyway.

To be honest, I would try to kindly ask release managers for a freeze
exception given the number of bugs upstream already closed since 2.6.0
came out. As far as I saw, almost all of the changes in 2.6.1 were bug
fixes. Cherrypicking those doesn't make too much sense in my opinion.

Regards,
Sven

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: i386 (x86_64)

Kernel: Linux 2.6.32-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages puppetmaster depends on:
ii  facter                       1.5.7-1     a library for retrieving facts fro
ii  lsb-base                     3.2-23.1    Linux Standard Base 3.2 init scrip
ii  puppet-common                2.6.0-4     Centralized configuration manageme

ii  ruby1.8                      1.8.7.302-2 Interpreter of object-oriented scr

Versions of packages puppetmaster recommends:
ii  libldap-ruby1.8               0.9.7-1.1  OpenLDAP library binding for Ruby 
ii  rails                         2.3.5-1.1  MVC ruby based framework geared fo
ii  ruby [rdoc]                   4.5        An interpreter of object-oriented 

Versions of packages puppetmaster suggests:
ii  apache2                   2.2.16-2       Apache HTTP Server metapackage
ii  apache2-mpm-prefork [apac 2.2.16-2       Apache HTTP Server - traditional n
ii  libapache2-mod-passenger  2.2.11debian-1 Rails and Rack support for Apache2
ii  librack-ruby              1.1.0-3        A modular Ruby webserver interface
pn  libstomp-ruby1.8          <none>         (no description available)
pn  mongrel                   <none>         (no description available)
pn  puppet-el                 <none>         (no description available)
pn  stompserver               <none>         (no description available)
ii  vim-puppet                2.6.0-4        syntax highlighting for puppet man

-- Configuration Files:
/etc/default/puppetmaster changed [not included]
/etc/puppet/fileserver.conf changed [not included]

-- no debconf information

-- debsums errors found:
debsums: changed file /usr/share/puppet/rack/puppetmasterd/config.ru (from puppetmaster package)
-------------- next part --------------
--- a/type/file/content.rb	2010-07-28 21:02:23.000000000 +0200
+++ b/type/file/content.rb	2010-09-17 17:41:04.000000000 +0200
@@ -184,7 +184,7 @@
     end
 
     def chunk_file_from_source(source_or_content)
-      request = Puppet::Indirector::Request.new(:file_content, :find, source_or_content.full_path)
+      request = Puppet::Indirector::Request.new(:file_content, :find, source_or_content.full_path.sub(/^\//,''))
       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