main(): Use ArchiveFileName() instead of private_archive_file_dir to

    calculate the path to the .mbox file.

    Also, change the order of unlocking so that its the reverse of the
    locking order (i.e. unlock the archive lock first, then unlock the
    list).

1 files changed, 3 insertions, 4 deletions

diff --git a/bin/arch b/bin/arch
index bcf1e19a4..952af3499 100644
--- a/bin/arch
+++ b/bin/arch
@@ -90,8 +90,7 @@ def main():
         except Errors.MMListError, e:
             usage(2, _('No such list "%(listname)s"\n%(e)s'))
         if mbox is None:
-            mbox = os.path.join(mlist.private_archive_file_dir,
-                                listname + '.mbox')
+            mbox = mlist.ArchiveFileName()
 
         # lay claim to the archive's lock file.  this is so no other post can
         # mess up the archive while we're glomming it.  we pick a suitably
@@ -120,10 +119,10 @@ def main():
         archiver.close()
         fp.close()
     finally:
-        if mlist:
-            mlist.Unlock()
         if lock:
             lock.unlock()
+        if mlist:
+            mlist.Unlock()
 
 
 if __name__ == '__main__':