Fix 2768 maillist resource is broken

Replace deprecated method call. This code was not tested before, so I've
tried to capture what I think the method was trying to do.

This version includes Luke's suggested change to better preserve the
original behavior.

Signed-off-by: Jesse Wolfe <jes5199@gmail.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/lib/puppet/type/maillist.rb b/lib/puppet/type/maillist.rb
index e2430aa13..4ab9be252 100755
--- a/lib/puppet/type/maillist.rb
+++ b/lib/puppet/type/maillist.rb
@@ -42,13 +42,10 @@ module Puppet
                     should = :absent
                 end
                 atype = Puppet::Type.type(:mailalias)
-                return provider.aliases.collect do |name, recipient|
-                    if atype[name]
-                        nil
-                    else
-                        malias = Puppet::Type.type(:mailalias).new(:name => name, :recipient => recipient, :ensure => should)
-                    end
-                end.compact
+
+                provider.aliases.
+                    reject  { |name,recipient| catalog.resource(:mailalias, name) }.
+                    collect { |name,recipient| atype.new(:name => name, :recipient => recipient, :ensure => should) }
             end
         end
     end