| 1 |
commit: aa8ff193675224cd110c3c489e561e8e8e30eab3 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 26 06:40:47 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 26 06:40:47 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=aa8ff193 |
| 7 |
|
| 8 |
depgraph: always check for autounmask breakage |
| 9 |
|
| 10 |
The 2.1.9 branch already does the same thing since commit |
| 11 |
65736474c0d70cb10ff1290b3787b61d8a502aed. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/_emerge/depgraph.py | 19 ++++++++++--------- |
| 15 |
1 files changed, 10 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 18 |
index d7ddd1a..3dc68ff 100644 |
| 19 |
--- a/pym/_emerge/depgraph.py |
| 20 |
+++ b/pym/_emerge/depgraph.py |
| 21 |
@@ -6673,15 +6673,16 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp |
| 22 |
allow_backtracking=False, |
| 23 |
backtrack_parameters=backtracker.get_best_run()) |
| 24 |
success, favorites = mydepgraph.select_files(myfiles) |
| 25 |
- if not success and mydepgraph.autounmask_breakage_detected(): |
| 26 |
- if "--debug" in myopts: |
| 27 |
- writemsg_level( |
| 28 |
- "\n\nautounmask breakage detected\n\n", |
| 29 |
- noiselevel=-1, level=logging.DEBUG) |
| 30 |
- myopts["--autounmask"] = "n" |
| 31 |
- mydepgraph = depgraph(settings, trees, myopts, myparams, spinner, |
| 32 |
- frozen_config=frozen_config, allow_backtracking=False) |
| 33 |
- success, favorites = mydepgraph.select_files(myfiles) |
| 34 |
+ |
| 35 |
+ if not success and mydepgraph.autounmask_breakage_detected(): |
| 36 |
+ if "--debug" in myopts: |
| 37 |
+ writemsg_level( |
| 38 |
+ "\n\nautounmask breakage detected\n\n", |
| 39 |
+ noiselevel=-1, level=logging.DEBUG) |
| 40 |
+ myopts["--autounmask"] = "n" |
| 41 |
+ mydepgraph = depgraph(settings, trees, myopts, myparams, spinner, |
| 42 |
+ frozen_config=frozen_config, allow_backtracking=False) |
| 43 |
+ success, favorites = mydepgraph.select_files(myfiles) |
| 44 |
|
| 45 |
return (success, mydepgraph, favorites) |
Archives