pending_requests(): Backwards compatibility code to handle the tuple

representing the record for held messages.  In pre-2.0b3 it was a
5-tuple, but it is now a 6-tuple.

1 files changed, 6 insertions, 1 deletions

diff --git a/cron/checkdbs b/cron/checkdbs
index cf5dae093..e80f58f35 100755
--- a/cron/checkdbs
+++ b/cron/checkdbs
@@ -75,7 +75,12 @@ def pending_requests(mlist):
         if first:
             pending.append('\nPending posts:')
             first = 0
-        when, sender, subject, reason, text = mlist.GetRecord(id)
+        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)
         pending.append('     From: %s on %s\n    Cause: %s' %
                        (sender, time.ctime(when), reason))
         pending.append('')