diff options
| author | Adam Edwards <adamed@opscode.com> | 2014-01-07 13:42:49 -0800 |
|---|---|---|
| committer | adamedx <adamed@opscode.com> | 2014-01-13 12:32:40 -0800 |
| commit | c489fd45630cf555526c9cf66ae6540a2685d127 (patch) | |
| tree | 98bbd27c8c01f504f0393df59a76af83da238422 | |
| parent | 74579d3dfbc529fd21ac3b34bbf136bdf4830cf5 (diff) | |
| download | chef-c489fd45630cf555526c9cf66ae6540a2685d127.tar.gz | |
SID awareness in group base class to fix regression where resource always updates
| -rw-r--r-- | lib/chef/provider/group.rb | 8 | ||||
| -rw-r--r-- | lib/chef/provider/group/windows.rb | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lib/chef/provider/group.rb b/lib/chef/provider/group.rb index 09c2a0052d..2768de00eb 100644 --- a/lib/chef/provider/group.rb +++ b/lib/chef/provider/group.rb @@ -91,7 +91,7 @@ class Chef if(@new_resource.append) missing_members = [] @new_resource.members.each do |member| - next if @current_resource.members.include?(member) + next if find_current_group_member(member) missing_members << member end if missing_members.length > 0 @@ -100,7 +100,7 @@ class Chef members_to_be_removed = [] @new_resource.excluded_members.each do |member| - if @current_resource.members.include?(member) + if find_current_group_member(member) members_to_be_removed << member end end @@ -116,6 +116,10 @@ class Chef !@change_desc.empty? end + def find_current_group_member(member) + @current_resource.members.include?(member) + end + def action_create case @group_exists when false diff --git a/lib/chef/provider/group/windows.rb b/lib/chef/provider/group/windows.rb index ebe37fa68d..13ba8f24cb 100644 --- a/lib/chef/provider/group/windows.rb +++ b/lib/chef/provider/group/windows.rb @@ -59,8 +59,7 @@ class Chef if @new_resource.append members_to_be_added = [ ] @new_resource.members.each do |member| - member_sid = local_group_name_to_sid(member) - members_to_be_added << member if !@current_resource.members.include?(member_sid) + members_to_be_added << member if ! find_current_group_member(member) end # local_add_members will raise ERROR_MEMBER_IN_ALIAS if a @@ -70,7 +69,7 @@ class Chef members_to_be_removed = [ ] @new_resource.excluded_members.each do |member| member_sid = local_group_name_to_sid(member) - members_to_be_removed << member if @current_resource.members.include?(member_sid) + members_to_be_removed << member if find_current_group_member(member) end @net_group.local_delete_members(members_to_be_removed) unless members_to_be_removed.empty? else @@ -78,6 +77,11 @@ class Chef end end + def find_current_group_member(member) + member_sid = local_group_name_to_sid(member) + @current_resource.members.include?(member_sid) + end + def remove_group @net_group.local_delete end |