|
Lines 81-86
Link Here
|
| 81 |
myaction=None |
81 |
myaction=None |
| 82 |
myopts=[] |
82 |
myopts=[] |
| 83 |
myfiles=[] |
83 |
myfiles=[] |
|
|
84 |
ignorance=[] |
| 84 |
edebug=0 |
85 |
edebug=0 |
| 85 |
|
86 |
|
| 86 |
# process short actions and options |
87 |
# process short actions and options |
|
Lines 145-153
Link Here
|
| 145 |
myaction=x |
146 |
myaction=x |
| 146 |
elif x[-1]=="/": |
147 |
elif x[-1]=="/": |
| 147 |
# this little conditional helps tab completion |
148 |
# this little conditional helps tab completion |
| 148 |
myfiles.append(x[:-1]) |
149 |
if x[0]=="^": |
|
|
150 |
ignorance.append(portage.dep_expand(x[1:-1],portage.portdb)) |
| 151 |
else: |
| 152 |
myfiles.append(x[:-1]) |
| 149 |
else: |
153 |
else: |
| 150 |
myfiles.append(x) |
154 |
if x[0]=="^": |
|
|
155 |
ignorance.append(portage.dep_expand(x[1:],portage.portdb)) |
| 156 |
else: |
| 157 |
myfiles.append(x) |
| 151 |
|
158 |
|
| 152 |
if (myaction in ["world", "system"]) and myfiles: |
159 |
if (myaction in ["world", "system"]) and myfiles: |
| 153 |
print "emerge: please specify a package class (\"world\" or \"system\") or individual packages, but not both." |
160 |
print "emerge: please specify a package class (\"world\" or \"system\") or individual packages, but not both." |
|
Lines 599-608
Link Here
|
| 599 |
olddbapi=None |
606 |
olddbapi=None |
| 600 |
class depgraph: |
607 |
class depgraph: |
| 601 |
|
608 |
|
| 602 |
def __init__(self,myaction,myopts): |
609 |
def __init__(self,myaction,myopts,ignorance): |
| 603 |
global olddbapi |
610 |
global olddbapi |
| 604 |
self.missingbins=[] |
611 |
self.missingbins=[] |
|
|
612 |
self.ignorance=[] |
| 605 |
self.myaction=myaction |
613 |
self.myaction=myaction |
|
|
614 |
self.ignorance=ignorance |
| 606 |
self.virts=portage.getvirtuals("/") |
615 |
self.virts=portage.getvirtuals("/") |
| 607 |
self.digraph=portage.digraph() |
616 |
self.digraph=portage.digraph() |
| 608 |
self.orderedkeys=[] |
617 |
self.orderedkeys=[] |
|
Lines 1005-1011
Link Here
|
| 1005 |
print "\n*** Package in world file is not installed: "+x |
1014 |
print "\n*** Package in world file is not installed: "+x |
| 1006 |
mylist=[] |
1015 |
mylist=[] |
| 1007 |
for x in sysdict.keys(): |
1016 |
for x in sysdict.keys(): |
| 1008 |
mylist.append(sysdict[x]) |
1017 |
if not self.ignorance.__contains__(sysdict[x]): |
|
|
1018 |
mylist.append(sysdict[x]) |
| 1009 |
|
1019 |
|
| 1010 |
for mydep in mylist: |
1020 |
for mydep in mylist: |
| 1011 |
myeb=portage.portdb.xmatch("bestmatch-visible",mydep) |
1021 |
myeb=portage.portdb.xmatch("bestmatch-visible",mydep) |
|
Lines 2164-2170
Link Here
|
| 2164 |
print darkgreen("emerge: It seems we have nothing to resume...") |
2174 |
print darkgreen("emerge: It seems we have nothing to resume...") |
| 2165 |
sys.exit(0) |
2175 |
sys.exit(0) |
| 2166 |
|
2176 |
|
| 2167 |
mydepgraph=depgraph(myaction,myopts) |
2177 |
mydepgraph=depgraph(myaction,myopts,ignorance) |
| 2168 |
if myaction in ["system","world"]: |
2178 |
if myaction in ["system","world"]: |
| 2169 |
print "Calculating",myaction,"dependencies ", |
2179 |
print "Calculating",myaction,"dependencies ", |
| 2170 |
if not mydepgraph.xcreate(myaction): |
2180 |
if not mydepgraph.xcreate(myaction): |
