diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-27 16:17:09 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-27 16:17:09 -0700 |
| commit | 445f1ae80fa64950f1058a62fd4aab1becc80709 (patch) | |
| tree | 264986b092743eab91673692016ee4ea9b6a8a39 | |
| parent | d8c868bbf2f2ffc1b2890e7c4d57f03621ac9007 (diff) | |
| download | portage-445f1ae80fa64950f1058a62fd4aab1becc80709.tar.gz portage-445f1ae80fa64950f1058a62fd4aab1becc80709.tar.bz2 portage-445f1ae80fa64950f1058a62fd4aab1becc80709.zip | |
backtrack_depgraph: display_problems for each run
| -rw-r--r-- | pym/_emerge/depgraph.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 8ad054797..de75eb131 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6631,6 +6631,8 @@ def backtrack_depgraph(settings, trees, myopts, myparams, def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, spinner): + debug = "--debug" in myopts + mydepgraph = None max_retries = myopts.get('--backtrack', 10) max_depth = max(1, (max_retries + 1) / 2) allow_backtracking = max_retries > 0 @@ -6641,6 +6643,13 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp myopts, spinner) while backtracker: + + if debug and mydepgraph is not None: + writemsg_level( + "\n\nbacktracking try %s \n\n" % \ + backtracked, noiselevel=-1, level=logging.DEBUG) + mydepgraph.display_problems() + backtrack_parameters = backtracker.get() mydepgraph = depgraph(settings, trees, myopts, myparams, spinner, @@ -6663,10 +6672,11 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp if not (success or mydepgraph.success_without_autounmask()) and backtracked: - if "--debug" in myopts: + if debug: writemsg_level( "\n\nbacktracking aborted after %s tries\n\n" % \ backtracked, noiselevel=-1, level=logging.DEBUG) + mydepgraph.display_problems() mydepgraph = depgraph(settings, trees, myopts, myparams, spinner, frozen_config=frozen_config, @@ -6675,10 +6685,11 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp success, favorites = mydepgraph.select_files(myfiles) if not success and mydepgraph.autounmask_breakage_detected(): - if "--debug" in myopts: + if debug: writemsg_level( "\n\nautounmask breakage detected\n\n", noiselevel=-1, level=logging.DEBUG) + mydepgraph.display_problems() myopts["--autounmask"] = "n" mydepgraph = depgraph(settings, trees, myopts, myparams, spinner, frozen_config=frozen_config, allow_backtracking=False) |