summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mailman/MailList.py3
-rw-r--r--modules/maillist.py3
2 files changed, 6 insertions, 0 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index bb0e6de60..243f1ff49 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -527,16 +527,19 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
raise mm_err.MMNoSuchUserError
def DoActualRemoval(alias, me=self):
+ kind = "(unfound)"
try:
del me.passwords[alias]
except KeyError:
pass
try:
me.members.remove(alias)
+ kind = "regular"
except ValueError:
pass
try:
me.digest_members.remove(alias)
+ kind = "digest"
except ValueError:
pass
diff --git a/modules/maillist.py b/modules/maillist.py
index bb0e6de60..243f1ff49 100644
--- a/modules/maillist.py
+++ b/modules/maillist.py
@@ -527,16 +527,19 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
raise mm_err.MMNoSuchUserError
def DoActualRemoval(alias, me=self):
+ kind = "(unfound)"
try:
del me.passwords[alias]
except KeyError:
pass
try:
me.members.remove(alias)
+ kind = "regular"
except ValueError:
pass
try:
me.digest_members.remove(alias)
+ kind = "digest"
except ValueError:
pass