GetOwnerEmail(): new method to return the -owner address.

Lock(): If the Load() call fails with an MMUnknownListError, be sure
to unlock the list before re-raising the exception.

1 files changed, 11 insertions, 3 deletions

diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index 2eb444b84..d66814b21 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -71,7 +71,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
         self.InitTempVars(name)
         if name:
             if lock:
-                # This will load the database
+                # This will load the database.
                 self.Lock()
             else:
                 self.Load()
@@ -132,6 +132,9 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
     def GetAdminEmail(self):
         return '%s-admin@%s' % (self._internal_name, self.host_name)
 
+    def GetOwnerEmail(self):
+        return '%s-owner@%s' % (self._internal_name, self.host_name)
+
     def GetMemberAdminEmail(self, member):
         """Usually the member addr, but modified for umbrella lists.
 
@@ -1339,8 +1342,13 @@ it will not be changed."""),
 
     def Lock(self, timeout=0):
         self.__lock.lock(timeout)
-        # Must reload our database for consistency
-        self.Load()
+        # Must reload our database for consistency.  Watch out for lists that
+        # don't exist.
+        try:
+            self.Load()
+        except Errors.MMUnknownListError:
+            self.Unlock()
+            raise
     
     def Unlock(self):
         self.__lock.unlock(unconditionally=1)