diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-10-10 16:18:37 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-10-10 16:18:37 -0700 |
| commit | 34e329ae93e4cfb409d4de88ceabdbda863c2f91 (patch) | |
| tree | 4de34dc9871fc0f71252a6b9047fb5b2f8a4d062 | |
| parent | Tweak --backtrack debug message. (diff) | |
| download | portage-34e329ae93e4cfb409d4de88ceabdbda863c2f91.tar.gz portage-34e329ae93e4cfb409d4de88ceabdbda863c2f91.tar.bz2 portage-34e329ae93e4cfb409d4de88ceabdbda863c2f91.zip | |
Ensure backtrack loop termination.
| -rw-r--r-- | pym/_emerge/depgraph.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 3ed81e445..054dc8ca0 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5531,11 +5531,15 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp if success or mydepgraph.success_without_autounmask(): break + elif not allow_backtracking: + break elif backtracked > max_retries: break elif mydepgraph.need_restart(): backtracked += 1 - backtracker.feedback(mydepgraph.get_backtrack_infos()) + backtracker.feedback(mydepgraph.get_backtrack_infos()) + else: + break if not (success or mydepgraph.success_without_autounmask()) and backtracked: |