[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit 4265825096677f596a6b8a2274e0bb802a60904c
Author: Brice Figureau <brice at daysofwonder.com>
Date:   Wed Oct 8 14:37:44 2008 +0200

    Fix #1636 - part2 - correct some client errors.
    
    #1636 original patch was incomplete, and on some cases, the client
    could report:
    "Failed to generate additional resources during transaction:
    None of the provided sources exist"
    The server was trying to recurse when asking to list files and thus was
    returning an empty response instead of a "file" response.

diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb
index d87eb83..815d0ba 100755
--- a/lib/puppet/network/handler/fileserver.rb
+++ b/lib/puppet/network/handler/fileserver.rb
@@ -722,9 +722,13 @@ class Puppet::Network::Handler
                 valid_modules.each do |m|
                     modpath = mod_file_path(m, relpath, client)
                     if FileTest.exists?(modpath)
-                        ary = reclist(modpath, recurse, ignore)
-                        ary = [] if ary.nil?
-                        result += ary
+                        if FileTest.directory?(modpath) and recurse
+                            ary = reclist(modpath, recurse, ignore)
+                            ary = [] if ary.nil?
+                            result += ary
+                        else
+                            result += [["/", File.stat(modpath).ftype]]
+                        end
                     end
                 end
                 result

-- 
Puppet packaging for Debian