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

[Paul Berry]

The following commit has been merged in the upstream branch:
commit f4e002eee99f23aa5da28e38a867daad3a56786b
Merge: 6075f8fd98b02810f86609566993c7eb182607f7 67e1bba154accd900b9690d96cec8b050f8082e7
Author: Paul Berry <paul at puppetlabs.com>
Date:   Tue Jan 25 15:17:12 2011 -0800

    Merge branch 'ticket/2.6.next/5931' into 2.6.next
    
    * ticket/2.6.next/5931:
      (#5931) Prevent errors when calling insync? on audited properties
      Maint: Removed dead code from resource harness.
      Maint: Rename misleading insync? method in file provider

diff --combined lib/puppet/type/service.rb
index 2801f3a,973a76c..0d09c3d
--- a/lib/puppet/type/service.rb
+++ b/lib/puppet/type/service.rb
@@@ -73,7 -73,7 +73,7 @@@ module Puppe
  
          if property = @resource.property(:enable)
            val = property.retrieve
-           property.sync unless property.insync?(val)
+           property.sync unless property.safe_insync?(val)
          end
  
          event
@@@ -144,16 -144,10 +144,16 @@@
          specified."
      end
      newparam(:status) do
 -      desc "Specify a *status* command manually.  If left
 -        unspecified, the status method will be determined
 -        automatically, usually by looking for the service in the
 -        process table."
 +      desc "Specify a *status* command manually.  This command must
 +        return 0 if the service is running and a nonzero value otherwise.
 +        Ideally, these return codes should conform to
 +        [the LSB's specification for init script status actions](http://refspecs.freestandards.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html),
 +        but puppet only considers the difference between 0 and nonzero
 +        to be relevant.
 +
 +        If left unspecified, the status method will be determined
 +        automatically, usually by looking for the service in the process
 +        table."
      end
  
      newparam(:stop) do

-- 
Puppet packaging for Debian