pending_requests(): Subscription ID records unpack to a 6 tuple now,

which includes the fullname, but also watch out for older records
which don't include the fullname.

1 files changed, 9 insertions, 2 deletions

diff --git a/cron/checkdbs b/cron/checkdbs
index 7f0b2d4ea..721a499e9 100755
--- a/cron/checkdbs
+++ b/cron/checkdbs
@@ -79,8 +79,15 @@ def pending_requests(mlist):
         if first:
             pending.append(_('Pending subscriptions:'))
             first = 0
-        when, addr, passwd, digest, lang = mlist.GetRecord(id)
-        pending.append('    %s %s' % (addr, time.ctime(when)))
+        info = mlist.GetRecord(id)
+        if len(info) == 5:
+            # pre-2.0beta3 compatibility
+            when, addr, passwd, digest, lang = info
+            fullname = ''
+        else:
+            when, addr, fullname, passwd, digest, lang = info
+            fullname = '<%s>' % fullname
+        pending.append('    %s %s %s' % (fullname, addr, time.ctime(when)))
     first = 1
     for id in mlist.GetHeldMessageIds():
         if first: