summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-02-06 02:52:29 +0000
committerZac Medico <zmedico@gentoo.org>2006-02-06 02:52:29 +0000
commit27f1473dcf53c30d20d2380f3c4ac28ee183e7ae (patch)
treeb86da3aca7b2867064009b90b24ff0ea0ef50ecf
parentc454ce95d8799e64237ef20567c0f9727736b5b7 (diff)
downloadportage-27f1473dcf53c30d20d2380f3c4ac28ee183e7ae.tar.gz
portage-27f1473dcf53c30d20d2380f3c4ac28ee183e7ae.tar.bz2
portage-27f1473dcf53c30d20d2380f3c4ac28ee183e7ae.zip
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
-rwxr-xr-xbin/emerge5
1 files changed, 2 insertions, 3 deletions
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])