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.py | |
| parent | 7c5461984be838833d9f41a4a0e08e8f90871a04 (diff) | |
| download | portage-6557c596b6e3dd749c5bad942d10621e908b1f0d.tar.gz portage-6557c596b6e3dd749c5bad942d10621e908b1f0d.tar.bz2 portage-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.py')
| -rw-r--r-- | pym/portage.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index f5949bd5e..abc48ddf2 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -19,7 +19,7 @@ except: raise SystemExit, 127 try: - import os,string,types,atexit,signal,fcntl + import os,string,types,signal,fcntl import time,cPickle,traceback,copy import re,pwd,grp,commands import shlex,shutil @@ -95,6 +95,7 @@ try: import portage_gpg import portage_locks import portage_exec + from portage_exec import atexit_register, run_exitfuncs from portage_locks import unlockfile,unlockdir,lockfile,lockdir import portage_checksum from portage_checksum import perform_md5,perform_checksum,prelink_capable @@ -6901,7 +6902,7 @@ def portageexit(): close_portdbapi_caches() commit_mtimedb() -atexit.register(portageexit) +atexit_register(portageexit) if (secpass==2) and (not os.environ.has_key("SANDBOX_ACTIVE")): if settings["PORTAGE_CALLER"] in ["emerge","fixpackages"]: |