------------------------------------------------------------
revno: 1242
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Fri 2010-06-25 15:39:24 -0700
message:
  Fixed an issue in admindb that could result in a KeyError and "we hit a
  bug" response when a moderator acts on a post that had been handled by
  someone else after the first moderator had retrieved it.  Bug #598671.
modified:
  Mailman/Cgi/admindb.py
  NEWS


--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1

Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Cgi/admindb.py'
--- Mailman/Cgi/admindb.py	2010-03-29 20:48:11 +0000
+++ Mailman/Cgi/admindb.py	2010-06-25 22:39:24 +0000
@@ -780,12 +780,16 @@
         forwardaddrkey = 'forward-addr-%d' % request_id
         bankey = 'ban-%d' % request_id
         # Defaults
-        if mlist.GetRecordType(request_id) == HELDMSG:
-            msgdata = mlist.GetRecord(request_id)[5]
-            comment = msgdata.get('rejection_notice',
-                                  _('[No explanation given]'))
-        else:
-            comment = _('[No explanation given]')
+        try:
+            if mlist.GetRecordType(request_id) == HELDMSG:
+                msgdata = mlist.GetRecord(request_id)[5]
+                comment = msgdata.get('rejection_notice',
+                                      _('[No explanation given]'))
+            else:
+                comment = _('[No explanation given]')
+        except KeyError:
+            # Someone else must have handled this one after we got the page.
+            continue
         preserve = 0
         forward = 0
         forwardaddr = ''

=== modified file 'NEWS'
--- NEWS	2010-06-24 04:09:34 +0000
+++ NEWS	2010-06-25 22:39:24 +0000
@@ -17,6 +17,10 @@
 
   Bug Fixes and other patches
 
+    - Fixed an issue in admindb that could result in a KeyError and "we hit a
+      bug" response when a moderator acts on a post that had been handled by
+      someone else after the first moderator had retrieved it.  Bug #598671.
+
     - Fixed a bug which would fail to show a list on the admin and listinfo
       overview pages if its web_page_url contained a :port.  Bug # 597741.
 

_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to