fixing filesources so that the first found file is copied, and adding a test case

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

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/puppet/type/pfile/source.rb b/lib/puppet/type/pfile/source.rb
index 625458b23..a035878b1 100755
--- a/lib/puppet/type/pfile/source.rb
+++ b/lib/puppet/type/pfile/source.rb
@@ -29,7 +29,9 @@ module Puppet
                     if value =~ /^[0-9]+$/
                         value = value.to_i
                     end
-                    args[param] = value
+                    unless value.nil?
+                        args[param] = value
+                    end
                 }
 
                 # we can't manage ownership as root, so don't even try
@@ -37,7 +39,11 @@ module Puppet
                     args.delete(:owner)
                 end
 
-                return args
+                if args.empty?
+                    return nil
+                else
+                    return args
+                end
             end
 
             # This basically calls describe() on our file, and then sets all