diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2006-02-06 19:25:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-02-06 19:25:08 +0000 |
| commit | 6557c596b6e3dd749c5bad942d10621e908b1f0d (patch) | |
| tree | 124fbd1e816cc98f9b4558e19a0b21ebfc9aab3c /pym/portage_locks.py | |
| parent | use sys.argv[0] for the path to emerge rather then hard coding (diff) | |
| download | portage-multirepo-6557c596b6e3dd749c5bad942d10621e908b1f0d.tar.gz portage-multirepo-6557c596b6e3dd749c5bad942d10621e908b1f0d.tar.bz2 portage-multirepo-6557c596b6e3dd749c5bad942d10621e908b1f0d.zip | |
wrap all relevant atexit usage due to incompatibility with os.execv (needed for emerge to restart itself)
svn path=/main/trunk/; revision=2674
Diffstat (limited to 'pym/portage_locks.py')
| -rw-r--r-- | pym/portage_locks.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage_locks.py b/pym/portage_locks.py index 241ff9df..09daa2e4 100644 --- a/pym/portage_locks.py +++ b/pym/portage_locks.py @@ -4,7 +4,6 @@ # $Id: /var/cvsroot/gentoo-src/portage/pym/portage_locks.py,v 1.18.2.2 2005/01/16 02:35:33 carpaski Exp $ -import atexit import errno import os import stat @@ -15,6 +14,7 @@ import portage_exception import portage_file import portage_util import portage_data +from portage_exec import atexit_register from portage_localization import _ HARDLINK_FD = -2 @@ -30,7 +30,7 @@ def add_hardlock_file_to_cleanup(path): if os.path.isdir(mypath): hardlock_path_list = mypath[:] -atexit.register(clean_my_hardlocks) +atexit_register(clean_my_hardlocks) def lockdir(mydir): return lockfile(mydir,wantnewlockfile=1) |