Fixing #444. I was losing the list of sources when creating new children.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2111 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb
index 03453d3fc..bab737f4f 100644
--- a/lib/puppet/type/pfile.rb
+++ b/lib/puppet/type/pfile.rb
@@ -845,6 +845,7 @@ module Puppet
 
             result = []
             found = []
+            
             @states[:source].should.each do |source|
                 sourceobj, path = uri2obj(source)
 
@@ -869,7 +870,15 @@ module Puppet
                     # for conflicting files.
                     next if found.include?(name)
 
-                    args = {:source => source + file}
+                    # For directories, keep all of the sources, so that sourceselect still works as planned.
+                    if type == "directory"
+                        newsource = @states[:source].should.collect do |source|
+                            source + file
+                        end
+                    else
+                        newsource = source + file
+                    end
+                    args = {:source => newsource}
                     if type == file
                         args[:recurse] = nil
                     end