From 6557c596b6e3dd749c5bad942d10621e908b1f0d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 6 Feb 2006 19:25:08 +0000 Subject: wrap all relevant atexit usage due to incompatibility with os.execv (needed for emerge to restart itself) svn path=/main/trunk/; revision=2674 --- bin/emerge | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index e9aa65dd5..f9cd87081 100755 --- a/bin/emerge +++ b/bin/emerge @@ -9,7 +9,7 @@ sys.path = ["/usr/lib/portage/pym"]+sys.path import portage -import emergehelp,xpak,string,re,commands,time,shutil,traceback,atexit,signal,socket,types +import emergehelp,xpak,string,re,commands,time,shutil,traceback,signal,socket,types from stat import * from output import * @@ -492,7 +492,7 @@ def emergeexit(): emergelog(" *** terminating.") if "notitles" not in portage.features: xtermTitleReset() -atexit.register(emergeexit) +portage.atexit_register(emergeexit) def emergeexitsig(signum, frame): signal.signal(signal.SIGINT, signal.SIG_IGN) @@ -2119,7 +2119,7 @@ class depgraph: if len(mymergelist) > mergecount: emergelog(" *** RESTARTING emerge via exec() after change of portage version.") del portage.mtimedb["resume"]["mergelist"][0] - portage.portageexit() + portage.run_exitfuncs() mynewargv=[sys.argv[0],"--resume"] badlongopts = ("--ask","--tree","--changelog","--skipfirst","--resume") for arg in myopts: -- cgit v1.2.3-1-g7c22