MailList.py - Changed the already a member logic in the ChangeMemberAddress()

              method.  This time I think I got it right.

1 files changed, 4 insertions, 3 deletions

diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index a1374398..7cd2c5cb 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -1065,9 +1065,10 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin,
         newaddr = Utils.LCDomain(newaddr)
         Utils.ValidateEmail(newaddr)
         # Raise an exception if this email address is already a member of the
-        # list, but only if the new address is the same case-wise as the old
-        # address and we're not doing a global change.
-        if not globally and newaddr == oldaddr and self.isMember(newaddr):
+        # list, but only if the new address is the same case-wise as the
+        # existing member address and we're not doing a global change.
+        if not globally and (self.isMember(newaddr) and
+                newaddr == self.getMemberCPAddress(newaddr)):
             raise Errors.MMAlreadyAMember
         if newaddr == self.GetListEmail().lower():
             raise Errors.MMBadEmailError