|
Lines 5067-5075
Link Here
|
| 5067 |
# dependencies so that things like --fetchonly can still |
5067 |
# dependencies so that things like --fetchonly can still |
| 5068 |
# function despite collisions. |
5068 |
# function despite collisions. |
| 5069 |
pass |
5069 |
pass |
| 5070 |
else: |
5070 |
elif not previously_added: |
| 5071 |
self._slot_pkg_map[pkg.root][pkg.slot_atom] = pkg |
5071 |
self._slot_pkg_map[pkg.root][pkg.slot_atom] = pkg |
| 5072 |
self.mydbapi[pkg.root].cpv_inject(pkg) |
5072 |
self.mydbapi[pkg.root].cpv_inject(pkg) |
|
|
5073 |
self._filtered_trees[pkg.root]["porttree"].dbapi._clear_cache() |
| 5073 |
|
5074 |
|
| 5074 |
if not pkg.installed: |
5075 |
if not pkg.installed: |
| 5075 |
# Allow this package to satisfy old-style virtuals in case it |
5076 |
# Allow this package to satisfy old-style virtuals in case it |
|
Lines 8897-8902
Link Here
|
| 8897 |
return False |
8898 |
return False |
| 8898 |
except portage.exception.InvalidDependString: |
8899 |
except portage.exception.InvalidDependString: |
| 8899 |
pass |
8900 |
pass |
|
|
8901 |
in_graph = self._depgraph._slot_pkg_map[ |
| 8902 |
self._root].get(pkg.slot_atom) |
| 8903 |
if in_graph is None: |
| 8904 |
# Mask choices for packages which are not the highest visible |
| 8905 |
# version within their slot (since they usually trigger slot |
| 8906 |
# conflicts). |
| 8907 |
highest_visible, in_graph = self._depgraph._select_package( |
| 8908 |
self._root, pkg.slot_atom) |
| 8909 |
if pkg != highest_visible: |
| 8910 |
return False |
| 8911 |
elif in_graph != pkg: |
| 8912 |
# Mask choices for packages that would trigger a slot |
| 8913 |
# conflict with a previously selected package. |
| 8914 |
return False |
| 8900 |
return True |
8915 |
return True |
| 8901 |
|
8916 |
|
| 8902 |
def _dep_expand(self, atom): |
8917 |
def _dep_expand(self, atom): |
