Please review pull request #388: #10354 Missing userdel flag in provider/useradd.rb when managehome is set to true opened by (codec)
Description:
See http://projects.puppetlabs.com/issues/10354
- Opened: Mon Jan 23 09:02:47 UTC 2012
- Based on: puppetlabs:2.7.x (0a4d48fd26bf0aadb533a53fcff9d55ae9883f5f)
- Requested merge: codec:ticket/2.7.x/10354-missing-userdel-flag (ed7384546fd2f5b1dbbc61a2847c64227729041a)
Diff follows:
diff --git a/lib/puppet/provider/user/useradd.rb b/lib/puppet/provider/user/useradd.rb
index e374905..c44c19a 100644
--- a/lib/puppet/provider/user/useradd.rb
+++ b/lib/puppet/provider/user/useradd.rb
@@ -75,6 +75,12 @@ def addcmd
cmd += check_system_users
cmd << @resource[:name]
end
+
+ def deletecmd
+ cmd = [command(:delete)]
+ cmd += @resource.managehome? ? ['-r'] : []
+ cmd << @resource[:name]
+ end
def passcmd
age_limits = [:password_min_age, :password_max_age].select { |property| @resource.should(property) }
diff --git a/spec/unit/provider/user/useradd_spec.rb b/spec/unit/provider/user/useradd_spec.rb
index 724fc12..5aabfb7 100755
--- a/spec/unit/provider/user/useradd_spec.rb
+++ b/spec/unit/provider/user/useradd_spec.rb
@@ -88,6 +88,13 @@
@resource.stubs(:managehome?).returns true
@provider.check_manage_home.must == ["-m"]
end
+
+ it "should return an array with -r flag if home is managed" do
+ @resource.stubs(:managehome?).returns true
+ @resource.stubs(:ensure) == :absent
+ @provider.stubs(:command).returns("userdel")
+ @provider.deletecmd.must == ["userdel", "-r", "fakeval"]
+ end
it "should return an array with -M if home is not managed and on Redhat" do
Facter.stubs(:value).with("operatingsystem").returns("RedHat")
-- 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.
