On Sun, May 14, 2017 at 6:38 AM, Brian Dolbec <dol...@gentoo.org> wrote:
> On Tue, 9 May 2017 20:52:34 -0700 > Zac Medico <zmed...@gentoo.org> wrote: > > > Since autounmask changes are a strong indicator that backtracking > > will ultimately fail to produce a solution, terminate early for > > autounmask changes, and add a --autounmask-backtrack=<y|n> option > > to modify this behavior. The --autounmask-continue option implies > > --autounmask-backtrack=y behavior, for backward compatibility. > > > > When backtracking terminates early, the following warning message > > is displayed after the autounmask change(s): > > > > * In order to avoid wasting time, backtracking has terminated early > > * due to the above autounmask change(s). The --autounmask-backtrack=y > > * option can be used to force further backtracking, but there is no > > * guarantee that it will produce a solution. > > > > With this change, five of the existing cases fail unless > > --autounmask-backtrack=y is added to the options. For each of > > these cases, comments below the test case document how it behaves > > with and without --autounmask-backtrack=y enabled. > > > > X-Gentoo-bug: 615680 > > X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=615680 > > --- > > man/emerge.1 | 10 ++- > > pym/_emerge/depgraph.py | 80 > > ++++++++++++++++++---- > > pym/_emerge/main.py | 6 ++ > > pym/portage/tests/resolver/test_autounmask.py | 57 > > ++++++++++++++- .../tests/resolver/test_autounmask_use_breakage.py | > > 40 +++++++++++ .../test_slot_conflict_unsatisfied_deep_deps.py | > > 61 +++++++++++++++++ 6 files changed, 237 insertions(+), 17 > > deletions(-) > > > > Looks good, thank you :) > Thanks, merged: https://gitweb.gentoo.org/proj/portage.git/commit/?id=40505ceeadc769f4f01c66e52a19ce0bf2f59761 -- Thanks, Zac
