File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1656,13 +1656,16 @@ solver_addinfarchrules(Solver *solv, Map *addedmap)
16561656 }
16571657 }
16581658 if (first )
1659- continue ;
1659+ continue ; /* not the first in the group */
1660+
1661+ if (!bestscore )
1662+ continue ; /* did not find a score for this group */
16601663
16611664 /* speed up common case where installed package already has best arch */
16621665 if (allowedarchs .count == 1 && bests && allowedarchs .elements [0 ] == bests -> arch )
16631666 allowedarchs .count -- ; /* installed arch is best */
16641667
1665- if (allowedarchs .count && pool -> implicitobsoleteusescolors && installed && bestscore )
1668+ if (allowedarchs .count && pool -> implicitobsoleteusescolors && installed )
16661669 {
16671670 /* need an extra pass for lockstep checking: we only allow to keep an inferior arch
16681671 * if the corresponding installed package is not lock-stepped */
@@ -1707,7 +1710,7 @@ solver_addinfarchrules(Solver *solv, Map *addedmap)
17071710 if (ps -> name != s -> name || !MAPTST (addedmap , p ))
17081711 continue ;
17091712 a = pool_arch2score (pool , ps -> arch );
1710- if (a != 1 && bestscore && ((a ^ bestscore ) & 0xffff0000 ) != 0 )
1713+ if (a != 1 && ((a ^ bestscore ) & 0xffff0000 ) != 0 )
17111714 {
17121715 if (installed && ps -> repo == installed )
17131716 {
You can’t perform that action at this time.
0 commit comments