Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 85766 Details for
Bug 131207
portage-2.0.54-r1 emerge --emptytree world restarts after emerging portage
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
restart_resume-r1.patch
restart_resume-r1.patch (text/plain), 2.39 KB, created by
solar (RETIRED)
on 2006-04-29 07:09:04 UTC
(
hide
)
Description:
restart_resume-r1.patch
Filename:
MIME Type:
Creator:
solar (RETIRED)
Created:
2006-04-29 07:09:04 UTC
Size:
2.39 KB
patch
obsolete
>=== modified file 'bin/emerge' >--- bin/emerge >+++ bin/emerge >@@ -1687,9 +1687,7 @@ > ("livecvsportage" not in portage.settings.features): > if mylist.index(x)<len(mylist)-1: > p.append(red("*** Portage will stop merging at this point and reload itself,")) >- p.append(red(" recalculate dependencies, and complete the merge.")) >- if "--update" not in myopts: >- p.append(darkgreen(" You may avoid the remerging of packages by updating portage on its own.")) >+ p.append(red(" then resume the merge.")) > print > else: > if mysplit[0]=="sys-apps/portage" and ("--emptytree" in myopts): >@@ -1976,37 +1974,16 @@ > if (myver != portage.VERSION) and \ > ("livecvsportage" not in portage.settings.features): > if len(mymergelist) > mergecount: >- myargv=sys.argv >- myr=0 >- for myra in range(len(myargv)): >- if myargv[myr][0:len("portage")]=="portage": >- del myargv[myr] >- myr-=1 >- if myargv[myr][0:len("sys-apps/portage")]=="sys-apps/portage": >- del myargv[myr] >- myr-=1 >- myr+=1 > emergelog(" *** RESTARTING emerge via exec() after change of portage version.") >+ del portage.mtimedb["resume"]["mergelist"][0] > portage.portageexit() >- # Remove --ask from options before restarting >- mynewargv=[] >- badlongopts = ["--ask","--tree","--changelog"] >- badshortopts = ["a","t","l"] >- for arg in myargv: >- if arg[0:2] == "--": >- if arg in badlongopts: >- continue >- mynewargv += [arg] >- elif arg[0] == "-": >- myarg = "-" >- for ch in arg[1:]: >- if ch in badshortopts: >- continue >- myarg += ch >- mynewargv += [myarg] >- else: >- mynewargv += [arg] >- os.execv("/usr/lib/portage/bin/emerge", mynewargv) >+ mynewargv=[sys.argv[0],"--resume"] >+ badlongopts = ("--ask","--tree","--changelog","--skipfirst","--resume") >+ for arg in myopts: >+ if arg in badlongopts: >+ continue >+ mynewargv.append(arg) >+ 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]) >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 131207
:
85477
| 85766