From 9b7a47dbf92abf9bf6e4226ad4fe7da470c8da5f Mon Sep 17 00:00:00 2001
From: Mark Sapiro
Date: Sat, 22 Apr 2017 15:39:13 -0700
Subject: Enhance Switchboard.finish() to look for .pck if no .bak.

---
 src/mailman/core/switchboard.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/mailman/core/switchboard.py')

diff --git a/src/mailman/core/switchboard.py b/src/mailman/core/switchboard.py
index 315d564f3..e9e5e95f1 100644
--- a/src/mailman/core/switchboard.py
+++ b/src/mailman/core/switchboard.py
@@ -167,6 +167,13 @@ class Switchboard:
     def finish(self, filebase, preserve=False):
         """See `ISwitchboard`."""
         bakfile = os.path.join(self.queue_directory, filebase + '.bak')
+        # It is possible for a queue entry to be created by a non-Mailman user
+        # and not be readable by the Mailman user:group.  If this happens, we
+        # get here and the file is a .pck rather than a .bak.
+        pckfile = os.path.join(self.queue_directory, filebase + '.pck')
+        if not os.path.isfile(bakfile) and os.path.isfile(pckfile):
+            # We have a .pck and not a .bak so switch the name for the next.
+            bakfile = pckfile
         try:
             if preserve:
                 bad_dir = config.switchboards['bad'].queue_directory
-- 
cgit v1.2.3-70-g09d2