aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <msapiro@value.net>2013-03-28 15:43:27 -0700
committerMark Sapiro <msapiro@value.net>2013-03-28 15:43:27 -0700
commit25244ce18f64ece0781b0d7a3484e9c59f2ada98 (patch)
treeeaa73c75f6382fd48203fa5d2ad49e10ae6b3a98
parentf8be4916b365a654723436092a23f56e305b6b7f (diff)
downloadmailman2-25244ce18f64ece0781b0d7a3484e9c59f2ada98.tar.gz
mailman2-25244ce18f64ece0781b0d7a3484e9c59f2ada98.tar.xz
mailman2-25244ce18f64ece0781b0d7a3484e9c59f2ada98.zip
The subscribe log entry for a bin/add_members subscribe now identifies
bin/add_members as the source. (LP: 1161642)
-rwxr-xr-xNEWS3
-rwxr-xr-xbin/add_members8
2 files changed, 9 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 2b592aaf..d6a0e80d 100755
--- a/NEWS
+++ b/NEWS
@@ -58,6 +58,9 @@ Here is a history of user visible changes to Mailman.
Bug Fixes and other patches
+ - The subscribe log entry for a bin/add_members subscribe now identifies
+ bin/add_members as the source. (LP: 1161642)
+
- Fixed a bug where the Subject: of the user notification of a
bin/remove_members unsubscribe was not in the user's language.
(LP: 1161445)
diff --git a/bin/add_members b/bin/add_members
index 13321935..a471919e 100755
--- a/bin/add_members
+++ b/bin/add_members
@@ -1,6 +1,6 @@
#! @PYTHON@
#
-# Copyright (C) 1998-2010 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2013 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
@@ -137,7 +137,11 @@ def addall(mlist, members, digest, ack, outfp, nomail):
userdesc.digest = digest
try:
- mlist.ApprovedAddMember(userdesc, ack, 0)
+ mlist.ApprovedAddMember(userdesc,
+ ack=ack,
+ admin_notif=False,
+ whence='bin/add_members',
+ )
except Errors.MMAlreadyAMember:
print >> tee, _('Already a member: %(member)s')
except Errors.MembershipIsBanned, pattern: