From 3978a4b39fbb56a80f7095786e04d5ee09f95c2d Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Tue, 19 Nov 2002 01:07:45 +0000
Subject: dequeue(): "rejection-notice" (i.e. the dash) doesn't play nice when
 METADATA_FORMAT = METAFMT_ASCII.  Because of patch #567288 by Maximillian
 Dornseif, we have to upgrade the schema of any metadata files (i.e.
 rejection-notice -> rejection_notice).

---
 Mailman/Queue/Switchboard.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Mailman/Queue/Switchboard.py b/Mailman/Queue/Switchboard.py
index 298c10493..530055ada 100644
--- a/Mailman/Queue/Switchboard.py
+++ b/Mailman/Queue/Switchboard.py
@@ -145,6 +145,12 @@ class _Switchboard:
             os.unlink(dbfile)
         except EnvironmentError, e:
             if e.errno <> errno.ENOENT: raise
+        # 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.
+        if data.has_key('rejection-notice'):
+            data['rejection_notice'] = data['rejection-notice']
+            del data['rejection-notice']
         msgfp = None
         try:
             try:
-- 
cgit v1.2.3-70-g09d2