Add a grammatically correct 'has_feature' alias, and switch to using it where appropriate in existing code

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

3 files changed, 4 insertions, 2 deletions

diff --git a/lib/puppet/provider/user/netinfo.rb b/lib/puppet/provider/user/netinfo.rb
index 01d1dc275..35c1c6cd9 100644
--- a/lib/puppet/provider/user/netinfo.rb
+++ b/lib/puppet/provider/user/netinfo.rb
@@ -19,7 +19,7 @@ Puppet::Type.type(:user).provide :netinfo, :parent => Puppet::Provider::NameServ
 
     autogen_defaults :home => "/var/empty", :shell => "/usr/bin/false", :password => '********'
 
-    has_features :manages_passwords
+    has_feature :manages_passwords
 
     verify :gid, "GID must be an integer" do |value|
         value.is_a? Integer
diff --git a/lib/puppet/provider/user/useradd.rb b/lib/puppet/provider/user/useradd.rb
index 3cee99648..dd05952f5 100644
--- a/lib/puppet/provider/user/useradd.rb
+++ b/lib/puppet/provider/user/useradd.rb
@@ -20,7 +20,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     has_features :manages_homedir, :allows_duplicates
 
     if Puppet.features.libshadow? and (Facter.value(:kernel) == "Linux")
-        has_features :manages_passwords
+        has_feature :manages_passwords
     end
 
     def addcmd
diff --git a/lib/puppet/util/provider_features.rb b/lib/puppet/util/provider_features.rb
index c8edd52ec..4cc74f449 100644
--- a/lib/puppet/util/provider_features.rb
+++ b/lib/puppet/util/provider_features.rb
@@ -168,6 +168,8 @@ module Puppet::Util::ProviderFeatures
                     @declared_features << name
                 end
             end
+            # Aaah, grammatical correctness
+            @feature_module.send(:alias_method, :has_feature, :has_features)
         end
         @feature_module
     end