|
Lines 130-135
shortmapping={
Link Here
|
| 130 |
myaction=None |
130 |
myaction=None |
| 131 |
myopts=[] |
131 |
myopts=[] |
| 132 |
myfiles=[] |
132 |
myfiles=[] |
|
|
133 |
ignorance=[] |
| 133 |
edebug=0 |
134 |
edebug=0 |
| 134 |
|
135 |
|
| 135 |
# process short actions and options |
136 |
# process short actions and options |
|
Lines 194-202
for x in cmdline:
Link Here
|
| 194 |
myaction=x |
195 |
myaction=x |
| 195 |
elif x[-1]=="/": |
196 |
elif x[-1]=="/": |
| 196 |
# this little conditional helps tab completion |
197 |
# this little conditional helps tab completion |
| 197 |
myfiles.append(x[:-1]) |
198 |
if x[0]=="^": |
|
|
199 |
ignorance.append(portage.dep_expand(x[1:-1],portage.portdb)) |
| 200 |
else: |
| 201 |
myfiles.append(x[:-1]) |
| 198 |
else: |
202 |
else: |
| 199 |
myfiles.append(x) |
203 |
if x[0]=="^": |
|
|
204 |
ignorance.append(portage.dep_expand(x[1:],portage.portdb)) |
| 205 |
else: |
| 206 |
myfiles.append(x) |
| 200 |
|
207 |
|
| 201 |
if (myaction in ["world", "system"]) and myfiles: |
208 |
if (myaction in ["world", "system"]) and myfiles: |
| 202 |
print "emerge: please specify a package class (\"world\" or \"system\") or individual packages, but not both." |
209 |
print "emerge: please specify a package class (\"world\" or \"system\") or individual packages, but not both." |
|
Lines 690-696
def genericdict(mylist):
Link Here
|
| 690 |
olddbapi=None |
697 |
olddbapi=None |
| 691 |
class depgraph: |
698 |
class depgraph: |
| 692 |
|
699 |
|
| 693 |
def __init__(self,myaction,myopts): |
700 |
def __init__(self,myaction,myopts,ignorance): |
| 694 |
global olddbapi |
701 |
global olddbapi |
| 695 |
self.pkgsettings = portage.config(clone=portage.settings) |
702 |
self.pkgsettings = portage.config(clone=portage.settings) |
| 696 |
if not self.pkgsettings["ARCH"]: |
703 |
if not self.pkgsettings["ARCH"]: |
|
Lines 698-704
class depgraph:
Link Here
|
| 698 |
portage.writemsg(red("\a!!! Is the symlink correct? Is your portage tree complete?\n\n")) |
705 |
portage.writemsg(red("\a!!! Is the symlink correct? Is your portage tree complete?\n\n")) |
| 699 |
sys.exit(9) |
706 |
sys.exit(9) |
| 700 |
self.applied_useflags = {} |
707 |
self.applied_useflags = {} |
| 701 |
|
708 |
self.ignorance=[] |
|
|
709 |
self.ignorance=ignorance |
| 702 |
self.missingbins=[] |
710 |
self.missingbins=[] |
| 703 |
self.myaction=myaction |
711 |
self.myaction=myaction |
| 704 |
self.digraph=portage.digraph() |
712 |
self.digraph=portage.digraph() |
|
Lines 1103-1109
class depgraph:
Link Here
|
| 1103 |
print "\n*** Package in world file is not installed: "+x |
1111 |
print "\n*** Package in world file is not installed: "+x |
| 1104 |
mylist=[] |
1112 |
mylist=[] |
| 1105 |
for x in sysdict.keys(): |
1113 |
for x in sysdict.keys(): |
| 1106 |
mylist.append(sysdict[x]) |
1114 |
if not self.ignorance.__contains__(sysdict[x]): |
|
|
1115 |
mylist.append(sysdict[x]) |
| 1107 |
|
1116 |
|
| 1108 |
for mydep in mylist: |
1117 |
for mydep in mylist: |
| 1109 |
myeb=portage.portdb.xmatch("bestmatch-visible",mydep) |
1118 |
myeb=portage.portdb.xmatch("bestmatch-visible",mydep) |
|
Lines 2391-2397
elif "depclean"==myaction:
Link Here
|
| 2391 |
countdown(10, ">>> Depclean") |
2400 |
countdown(10, ">>> Depclean") |
| 2392 |
emergelog(" >>> depclean") |
2401 |
emergelog(" >>> depclean") |
| 2393 |
|
2402 |
|
| 2394 |
mydepgraph=depgraph(myaction,myopts) |
2403 |
mydepgraph=depgraph(myaction,myopts,[]) |
| 2395 |
syslist=getlist("system") |
2404 |
syslist=getlist("system") |
| 2396 |
worldlist=getlist("world") |
2405 |
worldlist=getlist("world") |
| 2397 |
|
2406 |
|
|
Lines 2502-2508
else:
Link Here
|
| 2502 |
if myopt not in myresumeopts: |
2511 |
if myopt not in myresumeopts: |
| 2503 |
myresumeopts.append(myopt) |
2512 |
myresumeopts.append(myopt) |
| 2504 |
myopts=myresumeopts |
2513 |
myopts=myresumeopts |
| 2505 |
mydepgraph=depgraph("resume",myopts) |
2514 |
mydepgraph=depgraph("resume",myopts,[]) |
| 2506 |
if "--resume" not in myopts: |
2515 |
if "--resume" not in myopts: |
| 2507 |
myopts+=["--resume"] |
2516 |
myopts+=["--resume"] |
| 2508 |
else: |
2517 |
else: |
|
Lines 2511-2517
else:
Link Here
|
| 2511 |
print darkgreen("emerge: It seems we have nothing to resume...") |
2520 |
print darkgreen("emerge: It seems we have nothing to resume...") |
| 2512 |
sys.exit(0) |
2521 |
sys.exit(0) |
| 2513 |
|
2522 |
|
| 2514 |
mydepgraph=depgraph(myaction,myopts) |
2523 |
mydepgraph=depgraph(myaction,myopts,ignorance) |
| 2515 |
if myaction in ["system","world"]: |
2524 |
if myaction in ["system","world"]: |
| 2516 |
print "Calculating",myaction,"dependencies ", |
2525 |
print "Calculating",myaction,"dependencies ", |
| 2517 |
if not mydepgraph.xcreate(myaction): |
2526 |
if not mydepgraph.xcreate(myaction): |
