Fixed cron/checkdbs to report unsubscriptions waiting approval. Bug #873821.

2 files changed, 13 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 62c50307..cdb46eb2 100644
--- a/NEWS
+++ b/NEWS
@@ -71,6 +71,9 @@ Here is a history of user visible changes to Mailman.
 
   Bug Fixes and other patches
 
+    - Fixed cron/checkdbs to report unsubscriptions waiting approval.
+      Bug #873821.
+
     - The fix for BUG #266220 (sf1181161) has been enhanced so that if there
       is a pathological HTML part such that the Approved: password text isn't
       found, but it is found after stripping out HTML tags, the post is
diff --git a/cron/checkdbs b/cron/checkdbs
index 12698109..e776f15d 100755
--- a/cron/checkdbs
+++ b/cron/checkdbs
@@ -1,6 +1,6 @@
 #! @PYTHON@
 #
-# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2011 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
@@ -14,7 +14,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 """Check for pending admin requests and mail the list owners if necessary.
 
@@ -149,6 +150,13 @@ def pending_requests(mlist):
             fullname = ' (%s)' % fullname
         pending.append('    %s%s %s' % (addr, fullname, time.ctime(when)))
     first = 1
+    for id in mlist.GetUnsubscriptionIds():
+        if first:
+            pending.append(_('Pending unsubscriptions:'))
+            first = 0
+        addr = mlist.GetRecord(id)
+        pending.append('    %s' % addr)
+    first = 1
     for id in mlist.GetHeldMessageIds():
         if first:
             pending.append(_('\nPending posts:'))