|
Lines 1432-1442
Link Here
|
| 1432 |
enforce correct merge order.""" |
1432 |
enforce correct merge order.""" |
| 1433 |
fakedb = self.mydbapi[myroot] |
1433 |
fakedb = self.mydbapi[myroot] |
| 1434 |
new_pkgs = [] |
1434 |
new_pkgs = [] |
|
|
1435 |
unresolveable = False |
| 1435 |
for cpv in blocked_pkgs: |
1436 |
for cpv in blocked_pkgs: |
| 1436 |
myslot = vardb.aux_get(cpv, ["SLOT"])[0] |
1437 |
myslot = vardb.aux_get(cpv, ["SLOT"])[0] |
| 1437 |
myslot_atom = "%s:%s" % (portage.dep_getkey(cpv), myslot) |
1438 |
myslot_atom = "%s:%s" % (portage.dep_getkey(cpv), myslot) |
| 1438 |
new_pkgs.append( |
1439 |
mymatches = fakedb.match(myslot_atom) |
| 1439 |
(myslot_atom, fakedb.match(myslot_atom)[0])) |
1440 |
if mymatches: |
|
|
1441 |
new_pkgs.append((myslot_atom, mymatches[0])) |
| 1442 |
else: |
| 1443 |
"""There's an installed package that's blocked and |
| 1444 |
there's no upgrade found to invalidate it, so leave |
| 1445 |
this blocker in the digraph.""" |
| 1446 |
unresolveable = True |
| 1447 |
break |
| 1448 |
if unresolveable: |
| 1449 |
continue |
| 1450 |
|
| 1440 |
for parent in self.digraph.parent_nodes(blocker): |
1451 |
for parent in self.digraph.parent_nodes(blocker): |
| 1441 |
ptype, proot, pcpv, pstatus = parent.split() |
1452 |
ptype, proot, pcpv, pstatus = parent.split() |
| 1442 |
pdbapi = self.trees[proot][self.pkg_tree_map[ptype]].dbapi |
1453 |
pdbapi = self.trees[proot][self.pkg_tree_map[ptype]].dbapi |
