aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2008-10-17 15:33:48 -0700
committerMark Sapiro <mark@msapiro.net>2008-10-17 15:33:48 -0700
commite027fb3db061d92f285b0ba50031c0990008097a (patch)
treed1cfd79aae6aa511dcd0388df07858f667ef86de
parentd367b818564a55b316af471506a8e371f75520f8 (diff)
downloadmailman2-e027fb3db061d92f285b0ba50031c0990008097a.tar.gz
mailman2-e027fb3db061d92f285b0ba50031c0990008097a.tar.xz
mailman2-e027fb3db061d92f285b0ba50031c0990008097a.zip
Changed bin/arch to attempt to open the mbox before wiping the old archive.
Launchpad bug #280418.
Diffstat (limited to '')
-rw-r--r--bin/arch11
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/arch b/bin/arch
index 40a75a0e..a98ae2af 100644
--- a/bin/arch
+++ b/bin/arch
@@ -1,6 +1,6 @@
#! @PYTHON@
#
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2008 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -161,6 +161,11 @@ def main():
# set the lock lifetime to 3 hours. XXX is this reasonable???
lock = LockFile(lockfile, lifetime=3*60*60)
lock.lock()
+ # Try to open mbox before wiping old archive.
+ try:
+ fp = open(mbox)
+ except IOError, msg:
+ usage(3, _('Cannot open mbox file %(mbox)s: %(msg)s'))
# Maybe wipe the old archives
if wipe:
if mlist.scrub_nondigest:
@@ -177,10 +182,6 @@ def main():
shutil.rmtree(mlist.archive_dir())
if mlist.scrub_nondigest and saved:
os.renames(savedir, atchdir)
- try:
- fp = open(mbox)
- except IOError, msg:
- usage(3, _('Cannot open mbox file %(mbox)s: %(msg)s'))
archiver = HyperArchive(mlist)
archiver.VERBOSE = verbose