From ab847568aabff28450e6bd5280c98c108da0b1f5 Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Sat, 14 Feb 2009 23:26:12 +1100 Subject: Cleaned up variable names to be more sane, clarified error messages and fixed incorrect use of 'value' variable rather than 'member'. --- CHANGELOG | 3 +++ lib/puppet/provider/nameservice/directoryservice.rb | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f84c69a06..187e36c67 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,7 @@ 0.24.8 + Fixed #1956 - Cleaned up variable names to be more sane, clarified error messages + and fixed incorrect use of 'value' variable rather than 'member'. + Fixed #1831 - Added sprintf function Fixed #1830 - Added regsubst function diff --git a/lib/puppet/provider/nameservice/directoryservice.rb b/lib/puppet/provider/nameservice/directoryservice.rb index cb9df2c30..42c52f0a7 100644 --- a/lib/puppet/provider/nameservice/directoryservice.rb +++ b/lib/puppet/provider/nameservice/directoryservice.rb @@ -457,25 +457,25 @@ class DirectoryService < Puppet::Provider::NameService def remove_unwanted_members(current_members, new_members) current_members.each do |member| - if not value.include?(member) + if not new_members.include?(member) cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-d", member, @resource[:name]] begin execute(cmd) rescue Puppet::ExecutionFailure => detail - raise Puppet::Error, "Could not set %s on %s[%s]: %s" % [param, @resource.class.name, @resource.name, detail] + raise Puppet::Error, "Could not remove %s from group: %s, %s" % [member, @resource.name, detail] end end end end def add_members(current_members, new_members) - new_members.each do |user| - if current_members.nil? or not current_members.include?(user) - cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-a", user, @resource[:name]] + new_members.each do |new_member| + if current_members.nil? or not current_members.include?(new_member) + cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-a", new_member, @resource[:name]] begin execute(cmd) rescue Puppet::ExecutionFailure => detail - raise Puppet::Error, "Could not set %s on %s[%s]: %s" % [param, @resource.class.name, @resource.name, detail] + raise Puppet::Error, "Could not add %s to group: %s, %s" % [new_member, @resource.name, detail] end end end -- cgit