|
Lines 89-94
Link Here
|
| 89 |
myaction=None |
89 |
myaction=None |
| 90 |
myopts=[] |
90 |
myopts=[] |
| 91 |
myfiles=[] |
91 |
myfiles=[] |
|
|
92 |
ignorance=[] |
| 92 |
edebug=0 |
93 |
edebug=0 |
| 93 |
|
94 |
|
| 94 |
# process short actions and options |
95 |
# process short actions and options |
|
Lines 153-161
Link Here
|
| 153 |
myaction=x |
154 |
myaction=x |
| 154 |
elif x[-1]=="/": |
155 |
elif x[-1]=="/": |
| 155 |
# this little conditional helps tab completion |
156 |
# this little conditional helps tab completion |
| 156 |
myfiles.append(x[:-1]) |
157 |
if x[0]=="^": |
|
|
158 |
ignorance.append(portage.dep_expand(x[1:-1],portage.portdb)) |
| 159 |
else: |
| 160 |
myfiles.append(x[:-1]) |
| 157 |
else: |
161 |
else: |
| 158 |
myfiles.append(x) |
162 |
if x[0]=="^": |
|
|
163 |
ignorance.append(portage.dep_expand(x[1:],portage.portdb)) |
| 164 |
else: |
| 165 |
myfiles.append(x) |
| 159 |
|
166 |
|
| 160 |
if (myaction in ["world", "system"]) and myfiles: |
167 |
if (myaction in ["world", "system"]) and myfiles: |
| 161 |
print "emerge: please specify a package class (\"world\" or \"system\") or individual packages, but not both." |
168 |
print "emerge: please specify a package class (\"world\" or \"system\") or individual packages, but not both." |
|
Lines 635-645
Link Here
|
| 635 |
olddbapi=None |
642 |
olddbapi=None |
| 636 |
class depgraph: |
643 |
class depgraph: |
| 637 |
|
644 |
|
| 638 |
def __init__(self,myaction,myopts): |
645 |
def __init__(self,myaction,myopts,ignorance): |
| 639 |
global olddbapi |
646 |
global olddbapi |
| 640 |
self.pkgsettings = portage.config(clone=portage.settings) |
647 |
self.pkgsettings = portage.config(clone=portage.settings) |
| 641 |
self.applied_useflags = {} |
648 |
self.applied_useflags = {} |
| 642 |
|
649 |
self.ignorance=[] |
|
|
650 |
self.ignorance=ignorance |
| 643 |
self.missingbins=[] |
651 |
self.missingbins=[] |
| 644 |
self.myaction=myaction |
652 |
self.myaction=myaction |
| 645 |
self.digraph=portage.digraph() |
653 |
self.digraph=portage.digraph() |
|
Lines 1037-1043
Link Here
|
| 1037 |
print "\n*** Package in world file is not installed: "+x |
1045 |
print "\n*** Package in world file is not installed: "+x |
| 1038 |
mylist=[] |
1046 |
mylist=[] |
| 1039 |
for x in sysdict.keys(): |
1047 |
for x in sysdict.keys(): |
| 1040 |
mylist.append(sysdict[x]) |
1048 |
if not self.ignorance.__contains__(sysdict[x]): |
|
|
1049 |
mylist.append(sysdict[x]) |
| 1041 |
|
1050 |
|
| 1042 |
for mydep in mylist: |
1051 |
for mydep in mylist: |
| 1043 |
myeb=portage.portdb.xmatch("bestmatch-visible",mydep) |
1052 |
myeb=portage.portdb.xmatch("bestmatch-visible",mydep) |
|
Lines 2360-2366
Link Here
|
| 2360 |
print darkgreen("emerge: It seems we have nothing to resume...") |
2369 |
print darkgreen("emerge: It seems we have nothing to resume...") |
| 2361 |
sys.exit(0) |
2370 |
sys.exit(0) |
| 2362 |
|
2371 |
|
| 2363 |
mydepgraph=depgraph(myaction,myopts) |
2372 |
mydepgraph=depgraph(myaction,myopts,ignorance) |
| 2364 |
if myaction in ["system","world"]: |
2373 |
if myaction in ["system","world"]: |
| 2365 |
print "Calculating",myaction,"dependencies ", |
2374 |
print "Calculating",myaction,"dependencies ", |
| 2366 |
if not mydepgraph.xcreate(myaction): |
2375 |
if not mydepgraph.xcreate(myaction): |
