| 1 |
commit: 445f1ae80fa64950f1058a62fd4aab1becc80709 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 27 23:17:09 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 27 23:17:09 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=445f1ae8 |
| 7 |
|
| 8 |
backtrack_depgraph: display_problems for each run |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/depgraph.py | 15 +++++++++++++-- |
| 12 |
1 files changed, 13 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 15 |
index 8ad0547..de75eb1 100644 |
| 16 |
--- a/pym/_emerge/depgraph.py |
| 17 |
+++ b/pym/_emerge/depgraph.py |
| 18 |
@@ -6631,6 +6631,8 @@ def backtrack_depgraph(settings, trees, myopts, myparams, |
| 19 |
|
| 20 |
def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, spinner): |
| 21 |
|
| 22 |
+ debug = "--debug" in myopts |
| 23 |
+ mydepgraph = None |
| 24 |
max_retries = myopts.get('--backtrack', 10) |
| 25 |
max_depth = max(1, (max_retries + 1) / 2) |
| 26 |
allow_backtracking = max_retries > 0 |
| 27 |
@@ -6641,6 +6643,13 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp |
| 28 |
myopts, spinner) |
| 29 |
|
| 30 |
while backtracker: |
| 31 |
+ |
| 32 |
+ if debug and mydepgraph is not None: |
| 33 |
+ writemsg_level( |
| 34 |
+ "\n\nbacktracking try %s \n\n" % \ |
| 35 |
+ backtracked, noiselevel=-1, level=logging.DEBUG) |
| 36 |
+ mydepgraph.display_problems() |
| 37 |
+ |
| 38 |
backtrack_parameters = backtracker.get() |
| 39 |
|
| 40 |
mydepgraph = depgraph(settings, trees, myopts, myparams, spinner, |
| 41 |
@@ -6663,10 +6672,11 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp |
| 42 |
|
| 43 |
if not (success or mydepgraph.success_without_autounmask()) and backtracked: |
| 44 |
|
| 45 |
- if "--debug" in myopts: |
| 46 |
+ if debug: |
| 47 |
writemsg_level( |
| 48 |
"\n\nbacktracking aborted after %s tries\n\n" % \ |
| 49 |
backtracked, noiselevel=-1, level=logging.DEBUG) |
| 50 |
+ mydepgraph.display_problems() |
| 51 |
|
| 52 |
mydepgraph = depgraph(settings, trees, myopts, myparams, spinner, |
| 53 |
frozen_config=frozen_config, |
| 54 |
@@ -6675,10 +6685,11 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp |
| 55 |
success, favorites = mydepgraph.select_files(myfiles) |
| 56 |
|
| 57 |
if not success and mydepgraph.autounmask_breakage_detected(): |
| 58 |
- if "--debug" in myopts: |
| 59 |
+ if debug: |
| 60 |
writemsg_level( |
| 61 |
"\n\nautounmask breakage detected\n\n", |
| 62 |
noiselevel=-1, level=logging.DEBUG) |
| 63 |
+ mydepgraph.display_problems() |
| 64 |
myopts["--autounmask"] = "n" |
| 65 |
mydepgraph = depgraph(settings, trees, myopts, myparams, spinner, |
| 66 |
frozen_config=frozen_config, allow_backtracking=False) |
Archives