mirror
/
archivemail
mirror of https://git.code.sf.net/p/archivemail/code
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't run clean_up() by means of atexit, but use a plain finally clause in the 

main archive() function.  This is simpler, and it works better with the
testsuite calling archive() directly, where the atexit handler isn't triggered.
This commit is contained in:
Nikolaus Schulz 2006-10-29 03:10:45 +00:00
parent 2dbd3c1940
commit 99cfab1f4e
1 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
archivemail.py
View File

@ -48,11 +48,10 @@ def check_python_version():
print too_old_error print too_old_error
sys.exit(1) sys.exit(1)
# define & run this early because 'atexit' requires Python >= 2.0 # define & run this early
# (IMAP over SSL requires Python >= 2.3) # (IMAP over SSL requires Python >= 2.3)
check_python_version() check_python_version()
import atexit
import fcntl import fcntl
import getopt import getopt
import gzip import gzip
@ -1076,47 +1075,50 @@ def archive(mailbox_name):
vprint("changing effective user id to: %d" % mailbox_user) vprint("changing effective user id to: %d" % mailbox_user)
os.seteuid(mailbox_user) os.seteuid(mailbox_user)
# create a temporary directory for us to work in securely
old_temp_dir = tempfile.tempdir old_temp_dir = tempfile.tempdir
tempfile.tempdir = None try:
new_temp_dir = tempfile.mkdtemp('archivemail') # create a temporary directory for us to work in securely
assert(new_temp_dir) tempfile.tempdir = None
_stale.temp_dir = new_temp_dir new_temp_dir = tempfile.mkdtemp('archivemail')
tempfile.tempdir = new_temp_dir assert(new_temp_dir)
vprint("set tempfile directory to '%s'" % new_temp_dir) _stale.temp_dir = new_temp_dir
tempfile.tempdir = new_temp_dir
vprint("set tempfile directory to '%s'" % new_temp_dir)
if os.path.islink(mailbox_name): if os.path.islink(mailbox_name):
unexpected_error("'%s' is a symbolic link -- I feel nervous!" % unexpected_error("'%s' is a symbolic link -- I feel nervous!" %
mailbox_name) mailbox_name)
if imap_scheme == 'imap' or imap_scheme == 'imaps': if imap_scheme == 'imap' or imap_scheme == 'imaps':
vprint("guessing mailbox is of type: imap(s)") vprint("guessing mailbox is of type: imap(s)")
_archive_imap(mailbox_name, final_archive_name) _archive_imap(mailbox_name, final_archive_name)
elif os.path.isfile(mailbox_name): elif os.path.isfile(mailbox_name):
vprint("guessing mailbox is of type: mbox") vprint("guessing mailbox is of type: mbox")
_archive_mbox(mailbox_name, final_archive_name) _archive_mbox(mailbox_name, final_archive_name)
elif os.path.isdir(mailbox_name): elif os.path.isdir(mailbox_name):
cur_path = os.path.join(mailbox_name, "cur") cur_path = os.path.join(mailbox_name, "cur")
new_path = os.path.join(mailbox_name, "new") new_path = os.path.join(mailbox_name, "new")
if os.path.isdir(cur_path) and os.path.isdir(new_path): if os.path.isdir(cur_path) and os.path.isdir(new_path):
vprint("guessing mailbox is of type: maildir") vprint("guessing mailbox is of type: maildir")
_archive_dir(mailbox_name, final_archive_name, "maildir") _archive_dir(mailbox_name, final_archive_name, "maildir")
else:
vprint("guessing mailbox is of type: MH")
_archive_dir(mailbox_name, final_archive_name, "mh")
else: else:
vprint("guessing mailbox is of type: MH") user_error("'%s': no such file or directory" % mailbox_name)
_archive_dir(mailbox_name, final_archive_name, "mh")
else:
user_error("'%s': no such file or directory" % mailbox_name)
# remove our special temp directory - hopefully empty # remove our special temp directory - hopefully empty
os.rmdir(new_temp_dir) os.rmdir(new_temp_dir)
_stale.temp_dir = None _stale.temp_dir = None
tempfile.tempdir = old_temp_dir
# if we are running as root, revert the seteuid()/setegid() above finally:
if (os.getuid() == 0): tempfile.tempdir = old_temp_dir
vprint("changing effective groupid and userid back to root") clean_up()
os.setegid(former_gid)
os.seteuid(0)
# if we are running as root, revert the seteuid()/setegid() above
if (os.getuid() == 0):
vprint("changing effective groupid and userid back to root")
os.setegid(former_gid)
os.seteuid(0)
def _archive_mbox(mailbox_name, final_archive_name): def _archive_mbox(mailbox_name, final_archive_name):
"""Archive a 'mbox' style mailbox - used by archive_mailbox() """Archive a 'mbox' style mailbox - used by archive_mailbox()
@ -1342,7 +1344,6 @@ def set_signal_handlers():
# Make sure we clean up nicely - we don't want to leave stale procmail # Make sure we clean up nicely - we don't want to leave stale procmail
# lockfiles about if something bad happens to us. This is quite # lockfiles about if something bad happens to us. This is quite
# important, even though procmail will delete stale files after a while. # important, even though procmail will delete stale files after a while.
atexit.register(clean_up) # delete stale files on exceptions/normal exit
signal.signal(signal.SIGHUP, clean_up_signal) # signal 1 signal.signal(signal.SIGHUP, clean_up_signal) # signal 1
# SIGINT (signal 2) is handled as a python exception # SIGINT (signal 2) is handled as a python exception
signal.signal(signal.SIGQUIT, clean_up_signal) # signal 3 signal.signal(signal.SIGQUIT, clean_up_signal) # signal 3
@ -1350,7 +1351,7 @@ def set_signal_handlers():
def clean_up(): def clean_up():
"""Delete stale files -- to be registered with atexit.register()""" """Delete stale files"""
vprint("cleaning up ...") vprint("cleaning up ...")
_stale.clean() _stale.clean()