[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5rc1-120-g2247c80

Paul Berry paul at puppetlabs.com
Mon Feb 7 06:41:08 UTC 2011


The following commit has been merged in the upstream branch:
commit 0765afbd2459a60f5ded89a4c34a3bcb3c560399
Author: Paul Berry <paul at puppetlabs.com>
Date:   Tue Jan 25 14:03:14 2011 -0800

    Maint: Rename misleading insync? method in file provider
    
    This method actually checks whether the file owner is in sync.
    Renamed to is_owner_insync?
    
    Paired-with: Jesse Wolfe <jesse at puppetlabs.com>

diff --git a/lib/puppet/provider/file/posix.rb b/lib/puppet/provider/file/posix.rb
index 6cbf98e..415a5af 100644
--- a/lib/puppet/provider/file/posix.rb
+++ b/lib/puppet/provider/file/posix.rb
@@ -27,7 +27,7 @@ Puppet::Type.type(:file).provide :posix do
     end
   end
 
-  def insync?(current, should)
+  def is_owner_insync?(current, should)
     return true unless should
 
     should.each do |value|
diff --git a/lib/puppet/provider/file/win32.rb b/lib/puppet/provider/file/win32.rb
index 8ead69a..23aa491 100644
--- a/lib/puppet/provider/file/win32.rb
+++ b/lib/puppet/provider/file/win32.rb
@@ -14,7 +14,7 @@ Puppet::Type.type(:file).provide :microsoft_windows do
     id
   end
 
-  def insync?(current, should)
+  def is_owner_insync?(current, should)
     return true unless should
 
     should.each do |value|
diff --git a/lib/puppet/type/file/owner.rb b/lib/puppet/type/file/owner.rb
index d473da2..483cc7f 100755
--- a/lib/puppet/type/file/owner.rb
+++ b/lib/puppet/type/file/owner.rb
@@ -6,7 +6,7 @@ module Puppet
     @event = :file_changed
 
     def insync?(current)
-      provider.insync?(current, @should)
+      provider.is_owner_insync?(current, @should)
     end
 
     # We want to print names, not numbers

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list