Update of /cvsroot/mailman/mailman/Mailman/Commands
In directory sc8-pr-cvs1:/tmp/cvs-serv24139/Mailman/Commands

Modified Files:
      Tag: Release_2_1-maint
        cmd_confirm.py 
Log Message:
Backporting from trunk





Index: cmd_confirm.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Commands/cmd_confirm.py,v
retrieving revision 2.3
retrieving revision 2.3.2.1
diff -u -d -r2.3 -r2.3.2.1
--- cmd_confirm.py      21 Nov 2002 05:35:18 -0000      2.3
+++ cmd_confirm.py      31 Mar 2003 21:49:42 -0000      2.3.2.1
@@ -1,4 +1,4 @@
-# Copyright (C) 2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2003 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
 """
     confirm <confirmation-string>
         Confirm an action.  The confirmation-string is required and should be
-        supplied with in mailback confirmation notice.
+        supplied by a mailback confirmation notice.
 """
 
 from Mailman import mm_cfg
@@ -63,6 +63,10 @@
         res.results.append(_("""\
 You are not current a member.  Have you already unsubscribed or changed
 your email address?"""))
+    except Errors.HostileSubscriptionError:
+        res.results.append(_("""\
+You were not invited to this mailing list.  The invitation has been discarded,
+and both list administrators have been alerted."""))
     else:
         if ((results[0] == Pending.SUBSCRIPTION and mlist.send_welcome_msg)
             or



_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins

Reply via email to