|
Lines 2099-2134
class depgraph:
Link Here
|
| 2099 |
if (myver != portage.VERSION) and \ |
2099 |
if (myver != portage.VERSION) and \ |
| 2100 |
("livecvsportage" not in portage.settings.features): |
2100 |
("livecvsportage" not in portage.settings.features): |
| 2101 |
if len(mymergelist) > mergecount: |
2101 |
if len(mymergelist) > mergecount: |
| 2102 |
myargv=sys.argv |
|
|
| 2103 |
myr=0 |
| 2104 |
for myra in range(len(myargv)): |
| 2105 |
if myargv[myr][0:len("portage")]=="portage": |
| 2106 |
del myargv[myr] |
| 2107 |
myr-=1 |
| 2108 |
if myargv[myr][0:len("sys-apps/portage")]=="sys-apps/portage": |
| 2109 |
del myargv[myr] |
| 2110 |
myr-=1 |
| 2111 |
myr+=1 |
| 2112 |
emergelog(" *** RESTARTING emerge via exec() after change of portage version.") |
2102 |
emergelog(" *** RESTARTING emerge via exec() after change of portage version.") |
|
|
2103 |
del portage.mtimedb["resume"]["mergelist"][0] |
| 2113 |
portage.portageexit() |
2104 |
portage.portageexit() |
| 2114 |
# Remove --ask from options before restarting |
|
|
| 2115 |
mynewargv=[] |
2105 |
mynewargv=[] |
| 2116 |
badlongopts = ["--ask","--tree","--changelog"] |
2106 |
badlongopts = ["--ask","--tree","--changelog"] |
| 2117 |
badshortopts = ["a","t","l"] |
2107 |
for arg in myopts: |
| 2118 |
for arg in myargv: |
2108 |
if arg in badlongopts: |
| 2119 |
if arg[0:2] == "--": |
2109 |
continue |
| 2120 |
if arg in badlongopts: |
2110 |
mynewargv.append(arg) |
| 2121 |
continue |
2111 |
if "--resume" not in mynewargv: |
| 2122 |
mynewargv += [arg] |
2112 |
mynewargv.append("--resume") |
| 2123 |
elif arg[0] == "-": |
|
|
| 2124 |
myarg = "-" |
| 2125 |
for ch in arg[1:]: |
| 2126 |
if ch in badshortopts: |
| 2127 |
continue |
| 2128 |
myarg += ch |
| 2129 |
mynewargv += [myarg] |
| 2130 |
else: |
| 2131 |
mynewargv += [arg] |
| 2132 |
os.execv("/usr/lib/portage/bin/emerge", mynewargv) |
2113 |
os.execv("/usr/lib/portage/bin/emerge", mynewargv) |
| 2133 |
|
2114 |
|
| 2134 |
if ("--pretend" not in myopts) and ("--fetchonly" not in myopts) and ("--fetch-all-uri" not in myopts): |
2115 |
if ("--pretend" not in myopts) and ("--fetchonly" not in myopts) and ("--fetch-all-uri" not in myopts): |
