[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5-303-gfcfa26a

[Jesse Wolfe]

The following commit has been merged in the upstream branch:
commit 626aae793bae373d277c0ac07b07c3bacf462785
Merge: 25944edd1e2dae351a75682fffdd1ae1682e498e 35dd0702e9619706b6365a98da2826a612a4047a
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Mon Mar 14 13:28:59 2011 -0700

    Merge branch 'ticket/2.6.x/5661' of https://github.com/stschulte/puppet into 2.6.next

diff --combined lib/puppet/type.rb
index f70a3ec,cb1022d..205d809
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@@ -382,8 -382,8 +382,8 @@@ class Typ
  
      fail("Invalid parameter #{name}(#{name.inspect})") unless self.class.validattr?(name)
  
-     if name == :name
-       name = name_var
+     if name == :name && nv = name_var
+       name = nv
      end
  
      if obj = @parameters[name]
@@@ -403,8 -403,8 +403,8 @@@
  
      fail("Invalid parameter #{name}") unless self.class.validattr?(name)
  
-     if name == :name
-       name = name_var
+     if name == :name && nv = name_var
+       name = nv
      end
      raise Puppet::Error.new("Got nil value for #{name}") if value.nil?
  
@@@ -446,7 -446,7 +446,7 @@@
    # Create a transaction event.  Called by Transaction or by
    # a property.
    def event(options = {})
 -    Puppet::Transaction::Event.new({:resource => self, :file => file, :line => line, :tags => tags, :version => version}.merge(options))
 +    Puppet::Transaction::Event.new({:resource => self, :file => file, :line => line, :tags => tags}.merge(options))
    end
  
    # Let the catalog determine whether a given cached value is
@@@ -648,7 -648,7 +648,7 @@@
            "The is value is not in the is array for '#{property.name}'"
        end
        ensureis = is[property]
 -      if property.insync?(ensureis) and property.should == :absent
 +      if property.safe_insync?(ensureis) and property.should == :absent
          return true
        end
      end
@@@ -660,7 -660,7 +660,7 @@@
        end
  
        propis = is[property]
 -      unless property.insync?(propis)
 +      unless property.safe_insync?(propis)
          property.debug("Not in sync: #{propis.inspect} vs #{property.should.inspect}")
          insync = false
        #else
@@@ -957,25 -957,12 +957,25 @@@
    end
  
    newmetaparam(:audit) do
 -    desc "Audit specified attributes of resources over time, and report if any have changed.
 -      This attribute can be used to track changes to any resource over time, and can
 -      provide an audit trail of every change that happens on any given machine.
 -
 -      Note that you cannot both audit and manage an attribute - managing it guarantees
 -      the value, and any changes already get logged."
 +    desc "Marks a subset of this resource's unmanaged attributes for auditing. Accepts an
 +      attribute name or a list of attribute names.
 +
 +      Auditing a resource attribute has two effects: First, whenever a catalog
 +      is applied with puppet apply or puppet agent, Puppet will check whether
 +      that attribute of the resource has been modified, comparing its current
 +      value to the previous run; any change will be logged alongside any actions
 +      performed by Puppet while applying the catalog.
 +
 +      Secondly, marking a resource attribute for auditing will include that
 +      attribute in inspection reports generated by puppet inspect; see the
 +      puppet inspect documentation for more details.
 +
 +      Managed attributes for a resource can also be audited, but note that
 +      changes made by Puppet will be logged as additional modifications. (I.e.
 +      if a user manually edits a file whose contents are audited and managed,
 +      puppet agent's next two runs will both log an audit notice: the first run
 +      will log the user's edit and then revert the file to the desired state,
 +      and the second run will log the edit made by Puppet.)"
  
      validate do |list|
        list = Array(list).collect {|p| p.to_sym}

-- 
Puppet packaging for Debian