Changing "sourcematch" to "sourceselect"

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

2 files changed, 6 insertions, 6 deletions

diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb
index a9254e5ea..dabfdce29 100644
--- a/lib/puppet/type/pfile.rb
+++ b/lib/puppet/type/pfile.rb
@@ -191,7 +191,7 @@ module Puppet
             newvalues(:true, :false)
         end
 
-        newparam(:sourcematch) do
+        newparam(:sourceselect) do
             desc "Whether to copy all valid sources, or just the first one."
 
             defaultto :first
@@ -874,7 +874,7 @@ module Puppet
                     self.newchild(name, false, args)
                 }.reject {|c| c.nil? }
 
-                if self[:sourcematch] == :first
+                if self[:sourceselect] == :first
                     return result
                 end
             end
diff --git a/test/types/filesources.rb b/test/types/filesources.rb
index 49ef73fe2..1a4c61793 100755
--- a/test/types/filesources.rb
+++ b/test/types/filesources.rb
@@ -936,7 +936,7 @@ class TestFileSources < Test::Unit::TestCase
         assert_equal("yayness\n", File.read(newfile))
     end
 
-    def test_sourcematch
+    def test_sourceselect
         dest = tempfile()
         sources = []
         2.times { |i|
@@ -961,7 +961,7 @@ class TestFileSources < Test::Unit::TestCase
         obj = Puppet::Type.newfile(:path => dest, :recurse => true,
             :source => sources)
 
-        assert_equal(:first, obj[:sourcematch], "sourcematch has the wrong default")
+        assert_equal(:first, obj[:sourceselect], "sourceselect has the wrong default")
         # First, make sure we default to just copying file1
         assert_apply(obj)
 
@@ -970,9 +970,9 @@ class TestFileSources < Test::Unit::TestCase
         assert(FileTest.exists?(file3), "File from source 1 was not copied")
         assert_equal("0", File.read(file3), "file3 got wrong contents")
 
-        # Now reset sourcematch
+        # Now reset sourceselect
         assert_nothing_raised do
-            obj[:sourcematch] = :all
+            obj[:sourceselect] = :all
         end
         File.unlink(file1)
         File.unlink(file3)