Update of /cvsroot/mailman/mailman/Mailman/Queue
In directory sc8-pr-cvs1:/tmp/cvs-serv12049

Modified Files:
      Tag: Release_2_1-maint
        Switchboard.py 
Log Message:
Backport:

dequeue(): If we can't read a .db file, initialize data to the empty
dictionary, since the following test expects to do a has_key() on the
value.  Closes SF bug #707608.


Index: Switchboard.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Queue/Switchboard.py,v
retrieving revision 2.15
retrieving revision 2.15.2.1
diff -u -d -r2.15 -r2.15.2.1
--- Switchboard.py      19 Nov 2002 01:07:45 -0000      2.15
+++ Switchboard.py      2 Apr 2003 04:39:49 -0000       2.15.2.1
@@ -1,4 +1,4 @@
-# Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2003 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
@@ -145,6 +145,7 @@
             os.unlink(dbfile)
         except EnvironmentError, e:
             if e.errno <> errno.ENOENT: raise
+            data = {}
         # Between 2.1b4 and 2.1b5, the `rejection-notice' key in the metadata
         # was renamed to `rejection_notice', since dashes in the keys are not
         # supported in METAFMT_ASCII.



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

Reply via email to