This looks good to me. Tests written to prove the bug existed, added, and now committed to 2.6.next.
Daniel On Tue, Jan 25, 2011 at 13:54, James Turnbull <[email protected]> wrote: > Patch from Clay Caviness > > Signed-off-by: James Turnbull <[email protected]> > --- > .../provider/nameservice/directoryservice.rb | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/lib/puppet/provider/nameservice/directoryservice.rb > b/lib/puppet/provider/nameservice/directoryservice.rb > index 965a2aa..b018803 100644 > --- a/lib/puppet/provider/nameservice/directoryservice.rb > +++ b/lib/puppet/provider/nameservice/directoryservice.rb > @@ -442,7 +442,7 @@ class DirectoryService < Puppet::Provider::NameService > > def remove_unwanted_members(current_members, new_members) > current_members.each do |member| > - if not new_members.include?(member) > + if not new_members.flatten.include?(member) > cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-d", member, > @resource[:name]] > begin > execute(cmd) > @@ -454,7 +454,7 @@ class DirectoryService < Puppet::Provider::NameService > end > > def add_members(current_members, new_members) > - new_members.each do |new_member| > + new_members.flatten.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 > -- > 1.7.3.4 > > -- > 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. > > -- ⎋ Puppet Labs Developer – http://puppetlabs.com ✉ Daniel Pittman <[email protected]> ✆ Contact me via gtalk, email, or phone: +1 (877) 575-9775 ♲ Made with 100 percent post-consumer electrons -- 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.
