|
Lines 940-946
Link Here
|
| 940 |
parent_atoms = \ |
940 |
parent_atoms = \ |
| 941 |
self._dynamic_config._parent_atoms.get(pkg, set()) |
941 |
self._dynamic_config._parent_atoms.get(pkg, set()) |
| 942 |
if parent_atoms: |
942 |
if parent_atoms: |
| 943 |
parent_atoms = self._dynamic_config._slot_conflict_parent_atoms.intersection(parent_atoms) |
943 |
conflict_atoms = self._dynamic_config._slot_conflict_parent_atoms.intersection(parent_atoms) |
|
|
944 |
if conflict_atoms: |
| 945 |
parent_atoms = conflict_atoms |
| 944 |
if pkg >= existing_node: |
946 |
if pkg >= existing_node: |
| 945 |
# We only care about the parent atoms |
947 |
# We only care about the parent atoms |
| 946 |
# when they trigger a downgrade. |
948 |
# when they trigger a downgrade. |
|
Lines 1337-1343
Link Here
|
| 1337 |
if eliminate_pkg: |
1339 |
if eliminate_pkg: |
| 1338 |
atom_pkg_graph.remove(pkg) |
1340 |
atom_pkg_graph.remove(pkg) |
| 1339 |
|
1341 |
|
|
|
1342 |
# Yield < and <= atoms first, since those are more likely to |
| 1343 |
# cause a slot conflicts, and we want those atoms to be displayed |
| 1344 |
# in the resulting slot conflict message (see bug #291142). |
| 1345 |
less_than = [] |
| 1346 |
not_less_than = [] |
| 1340 |
for atom in cp_atoms: |
1347 |
for atom in cp_atoms: |
|
|
1348 |
if atom.operator in ('<', '<='): |
| 1349 |
less_than.append(atom) |
| 1350 |
else: |
| 1351 |
not_less_than.append(atom) |
| 1352 |
|
| 1353 |
for atom in chain(less_than, not_less_than): |
| 1341 |
child_pkgs = atom_pkg_graph.child_nodes(atom) |
1354 |
child_pkgs = atom_pkg_graph.child_nodes(atom) |
| 1342 |
yield (atom, child_pkgs[0]) |
1355 |
yield (atom, child_pkgs[0]) |
| 1343 |
|
1356 |
|
