From 27f1473dcf53c30d20d2380f3c4ac28ee183e7ae Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 6 Feb 2006 02:52:29 +0000 Subject: when emerge restarts itself, make /usr/lib/portage/bin/emerge the first argument in the list passed to os.execv (regression from revision 2667) svn path=/main/trunk/; revision=2672 --- bin/emerge | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index 30ba8ec3d..1a47d70ce 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2120,14 +2120,13 @@ class depgraph: emergelog(" *** RESTARTING emerge via exec() after change of portage version.") del portage.mtimedb["resume"]["mergelist"][0] portage.portageexit() - mynewargv=[] + mynewargv=["/usr/lib/portage/bin/emerge","--resume"] badlongopts = ("--ask","--tree","--changelog","--skipfirst","--resume") for arg in myopts: if arg in badlongopts: continue mynewargv.append(arg) - mynewargv.append("--resume") - os.execv("/usr/lib/portage/bin/emerge", mynewargv) + os.execv(mynewargv[0], mynewargv) if ("--pretend" not in myopts) and ("--fetchonly" not in myopts) and ("--fetch-all-uri" not in myopts): emergelog(" ::: completed emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[2]+" to "+x[1]) -- cgit v1.2.3-1-g7c22