Merge branch 'master' of git://reductivelabs.com/puppet into routing

2 files changed, 8 insertions, 3 deletions

diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb
index 1507c1725..2b3df1ae7 100644
--- a/lib/puppet/type/pfile.rb
+++ b/lib/puppet/type/pfile.rb
@@ -891,8 +891,8 @@ module Puppet
                     # For directories, keep all of the sources, so that
                     # sourceselect still works as planned.
                     if type == "directory"
-                        newsource = @parameters[:source].should.collect do |source|
-                            source + file
+                        newsource = @parameters[:source].should.collect do |tmpsource|
+                            tmpsource + file
                         end
                     else
                         newsource = source + file
diff --git a/test/ral/types/filesources.rb b/test/ral/types/filesources.rb
index 5ef002fa4..9517db5a5 100755
--- a/test/ral/types/filesources.rb
+++ b/test/ral/types/filesources.rb
@@ -955,8 +955,13 @@ class TestFileSources < Test::Unit::TestCase
         files = []
         [source1, source2, File.join(source1, "subdir"), File.join(source2, "subdir")].each_with_index do |dir, i|
             Dir.mkdir(dir)
+            # Make a single file in each directory
             file = File.join(dir, "file%s" % i)
             File.open(file, "w") { |f| f.puts "yay%s" % i}
+
+            # Now make a second one in each directory
+            file = File.join(dir, "second-file%s" % i)
+            File.open(file, "w") { |f| f.puts "yaysecond-%s" % i}
             files << file
         end
         
@@ -964,7 +969,7 @@ class TestFileSources < Test::Unit::TestCase
         
         assert_apply(obj)
         
-        ["file0", "file1", "subdir/file2", "subdir/file3"].each do |file|
+        ["file0", "file1", "second-file0", "second-file1", "subdir/file2", "subdir/second-file2", "subdir/file3", "subdir/second-file3"].each do |file|
             path = File.join(dest, file)
             assert(FileTest.exists?(path), "did not create %s" % file)