This is better, because logging is better (you get told you're missing the feature, as opposed to 'got false when expected true), and it also allows the system to only load the feature if needed (when suitability is tested), whereas this loads the feature even if it's never needed.
Signed-off-by: James Turnbull <[email protected]> --- Local-branch: tickets/master/7622 lib/puppet/provider/augeas/augeas.rb | 2 +- lib/puppet/provider/group/ldap.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb index a16f54b..d6d3a5e 100644 --- a/lib/puppet/provider/augeas/augeas.rb +++ b/lib/puppet/provider/augeas/augeas.rb @@ -19,7 +19,7 @@ require 'strscan' Puppet::Type.type(:augeas).provide(:augeas) do include Puppet::Util - confine :true => Puppet.features.augeas? + confine :feature => :augeas has_features :parse_commands, :need_to_run?,:execute_changes diff --git a/lib/puppet/provider/group/ldap.rb b/lib/puppet/provider/group/ldap.rb index 86c72a5..8b92f6b 100644 --- a/lib/puppet/provider/group/ldap.rb +++ b/lib/puppet/provider/group/ldap.rb @@ -14,7 +14,7 @@ Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do " - confine :true => Puppet.features.ldap?, :false => (Puppet[:ldapuser] == "") + confine :feature => :ldap, :false => (Puppet[:ldapuser] == "") # We're mapping 'members' here because we want to make it # easy for the ldap user provider to manage groups. This -- 1.7.1 -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
