summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormailman1998-03-19 00:42:34 +0000
committermailman1998-03-19 00:42:34 +0000
commit549a7dba72d29a31830a17bcd8b88cae3d9915f8 (patch)
treec72272cb11a6db25fbf5576739c73302424011a8
parenta6a72472eb791b2645166c31290fdd3ce5f4bcc3 (diff)
downloadmailman-549a7dba72d29a31830a17bcd8b88cae3d9915f8.tar.gz
mailman-549a7dba72d29a31830a17bcd8b88cae3d9915f8.tar.zst
mailman-549a7dba72d29a31830a17bcd8b88cae3d9915f8.zip
-rw-r--r--Mailman/MailCommandHandler.py8
-rw-r--r--modules/mm_mailcmd.py8
2 files changed, 10 insertions, 6 deletions
diff --git a/Mailman/MailCommandHandler.py b/Mailman/MailCommandHandler.py
index a4e435715..0f7156673 100644
--- a/Mailman/MailCommandHandler.py
+++ b/Mailman/MailCommandHandler.py
@@ -68,7 +68,7 @@ class MailCommandHandler:
else:
lines = string.split(mail.body, '\n')
if subject:
- self.AddError("Subject line ignored.")
+ self.AddError("Subject line ignored: %s" % subject)
for line in lines:
line = string.strip(line)
if not line:
@@ -102,12 +102,14 @@ class MailCommandHandler:
self.AddError("Usage: password <oldpw> <newpw>")
return
try:
- self.ChangeUserPassword(mail.GetSender(), args[0], args[1], args[1])
+ self.ChangeUserPassword(mail.GetSender(),
+ args[0], args[1], args[1])
self.AddToResponse('Succeded.')
except mm_err.MMListNotReady:
self.AddError("List is not functional.")
except mm_err.MMNotAMemberError:
- self.AddError("%s isn't subscribed to this list." % mail.GetSender())
+ self.AddError("%s isn't subscribed to this list." %
+ mail.GetSender())
except mm_err.MMBadPasswordError:
self.AddError("You gave the wrong password.")
except:
diff --git a/modules/mm_mailcmd.py b/modules/mm_mailcmd.py
index a4e435715..0f7156673 100644
--- a/modules/mm_mailcmd.py
+++ b/modules/mm_mailcmd.py
@@ -68,7 +68,7 @@ class MailCommandHandler:
else:
lines = string.split(mail.body, '\n')
if subject:
- self.AddError("Subject line ignored.")
+ self.AddError("Subject line ignored: %s" % subject)
for line in lines:
line = string.strip(line)
if not line:
@@ -102,12 +102,14 @@ class MailCommandHandler:
self.AddError("Usage: password <oldpw> <newpw>")
return
try:
- self.ChangeUserPassword(mail.GetSender(), args[0], args[1], args[1])
+ self.ChangeUserPassword(mail.GetSender(),
+ args[0], args[1], args[1])
self.AddToResponse('Succeded.')
except mm_err.MMListNotReady:
self.AddError("List is not functional.")
except mm_err.MMNotAMemberError:
- self.AddError("%s isn't subscribed to this list." % mail.GetSender())
+ self.AddError("%s isn't subscribed to this list." %
+ mail.GetSender())
except mm_err.MMBadPasswordError:
self.AddError("You gave the wrong password.")
except: