summaryrefslogtreecommitdiff
path: root/cron
diff options
context:
space:
mode:
authorbwarsaw2002-03-26 21:05:30 +0000
committerbwarsaw2002-03-26 21:05:30 +0000
commit7d17d6fae3b717f6e7fba12c000f48347b62d52f (patch)
treec9adf223f1db1001b96f6428d319a11bf0e91077 /cron
parent1ee0eb3a2a22636dc0a7f73b95caefa95ace6f08 (diff)
downloadmailman-7d17d6fae3b717f6e7fba12c000f48347b62d52f.tar.gz
mailman-7d17d6fae3b717f6e7fba12c000f48347b62d52f.tar.zst
mailman-7d17d6fae3b717f6e7fba12c000f48347b62d52f.zip
Diffstat (limited to 'cron')
-rwxr-xr-xcron/checkdbs18
1 files changed, 4 insertions, 14 deletions
diff --git a/cron/checkdbs b/cron/checkdbs
index a0e66ea43..4a97248cd 100755
--- a/cron/checkdbs
+++ b/cron/checkdbs
@@ -80,15 +80,9 @@ def pending_requests(mlist):
if first:
pending.append(_('Pending subscriptions:'))
first = 0
- 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
- if fullname:
- fullname = ' (%s)' % fullname
+ when, addr, fullname, passwd, digest, lang = mlist.GetRecord(id)
+ if fullname:
+ fullname = ' (%s)' % fullname
pending.append(' %s%s %s' % (addr, fullname, time.ctime(when)))
first = 1
for id in mlist.GetHeldMessageIds():
@@ -96,11 +90,7 @@ def pending_requests(mlist):
pending.append(_('\nPending posts:'))
first = 0
info = mlist.GetRecord(id)
- if len(info) == 5:
- # pre-2.0beta3 compatibility
- when, sender, subject, reason, text = mlist.GetRecord(id)
- else:
- when, sender, subject, reason, text, msgdata = mlist.GetRecord(id)
+ when, sender, subject, reason, text, msgdata = mlist.GetRecord(id)
date = time.ctime(when)
pending.append(_(
' From: %(sender)s on %(date)s\n Cause: %(reason)s'))