|
Lines 1783-1789
Link Here
|
| 1783 |
("livecvsportage" not in portage.settings.features): |
1783 |
("livecvsportage" not in portage.settings.features): |
| 1784 |
if mylist.index(x)<len(mylist)-1: |
1784 |
if mylist.index(x)<len(mylist)-1: |
| 1785 |
p.append(red("*** Portage will stop merging at this point and reload itself,")) |
1785 |
p.append(red("*** Portage will stop merging at this point and reload itself,")) |
| 1786 |
p.append(red(" recalculate dependencies, and complete the merge.")) |
1786 |
p.append(red(" then resume the merge.")) |
| 1787 |
if "--update" not in myopts: |
1787 |
if "--update" not in myopts: |
| 1788 |
p.append(darkgreen(" You may avoid the remerging of packages by updating portage on its own.")) |
1788 |
p.append(darkgreen(" You may avoid the remerging of packages by updating portage on its own.")) |
| 1789 |
print |
1789 |
print |
|
Lines 2119-2154
Link Here
|
| 2119 |
if (myver != portage.VERSION) and \ |
2119 |
if (myver != portage.VERSION) and \ |
| 2120 |
("livecvsportage" not in portage.settings.features): |
2120 |
("livecvsportage" not in portage.settings.features): |
| 2121 |
if len(mymergelist) > mergecount: |
2121 |
if len(mymergelist) > mergecount: |
| 2122 |
myargv=sys.argv |
|
|
| 2123 |
myr=0 |
| 2124 |
for myra in range(len(myargv)): |
| 2125 |
if myargv[myr][0:len("portage")]=="portage": |
| 2126 |
del myargv[myr] |
| 2127 |
myr-=1 |
| 2128 |
if myargv[myr][0:len("sys-apps/portage")]=="sys-apps/portage": |
| 2129 |
del myargv[myr] |
| 2130 |
myr-=1 |
| 2131 |
myr+=1 |
| 2132 |
emergelog(" *** RESTARTING emerge via exec() after change of portage version.") |
2122 |
emergelog(" *** RESTARTING emerge via exec() after change of portage version.") |
|
|
2123 |
del portage.mtimedb["resume"]["mergelist"][0] |
| 2133 |
portage.portageexit() |
2124 |
portage.portageexit() |
| 2134 |
# Remove --ask from options before restarting |
|
|
| 2135 |
mynewargv=[] |
2125 |
mynewargv=[] |
| 2136 |
badlongopts = ["--ask","--tree","--changelog"] |
2126 |
badlongopts = ("--ask","--tree","--changelog","--skipfirst","--resume") |
| 2137 |
badshortopts = ["a","t","l"] |
2127 |
for arg in myopts: |
| 2138 |
for arg in myargv: |
2128 |
if arg in badlongopts: |
| 2139 |
if arg[0:2] == "--": |
2129 |
continue |
| 2140 |
if arg in badlongopts: |
2130 |
mynewargv.append(arg) |
| 2141 |
continue |
2131 |
mynewargv.append("--resume") |
| 2142 |
mynewargv += [arg] |
|
|
| 2143 |
elif arg[0] == "-": |
| 2144 |
myarg = "-" |
| 2145 |
for ch in arg[1:]: |
| 2146 |
if ch in badshortopts: |
| 2147 |
continue |
| 2148 |
myarg += ch |
| 2149 |
mynewargv += [myarg] |
| 2150 |
else: |
| 2151 |
mynewargv += [arg] |
| 2152 |
os.execv("/usr/lib/portage/bin/emerge", mynewargv) |
2132 |
os.execv("/usr/lib/portage/bin/emerge", mynewargv) |
| 2153 |
|
2133 |
|
| 2154 |
if ("--pretend" not in myopts) and ("--fetchonly" not in myopts) and ("--fetch-all-uri" not in myopts): |
2134 |
if ("--pretend" not in myopts) and ("--fetchonly" not in myopts) and ("--fetch-all-uri" not in myopts): |
