Update of /cvsroot/mailman/mailman/cron
In directory usw-pr-cvs1:/tmp/cvs-serv21913/cron

Modified Files:
        checkdbs 
Log Message:
pending_requests(): We don't need to compare the length of the info
package to know how to unpack the request record.  bin/update should
now canonicalize them.


Index: checkdbs
===================================================================
RCS file: /cvsroot/mailman/mailman/cron/checkdbs,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -d -r2.9 -r2.10
*** checkdbs    15 Mar 2002 20:56:30 -0000      2.9
--- checkdbs    26 Mar 2002 21:05:30 -0000      2.10
***************
*** 81,93 ****
              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
          pending.append('    %s%s %s' % (addr, fullname, time.ctime(when)))
      first = 1
--- 81,87 ----
              pending.append(_('Pending subscriptions:'))
              first = 0
!         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
***************
*** 97,105 ****
              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)
          date = time.ctime(when)
          pending.append(_(
--- 91,95 ----
              first = 0
          info = mlist.GetRecord(id)
!         when, sender, subject, reason, text, msgdata = mlist.GetRecord(id)
          date = time.ctime(when)
          pending.append(_(


_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins

Reply via email to