summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-05-25 23:40:47 -0700
committerZac Medico <zmedico@gentoo.org>2011-05-25 23:40:47 -0700
commitaa8ff193675224cd110c3c489e561e8e8e30eab3 (patch)
tree999fbee57ae0610012007cbf1ae303126b447e01
parent4f65eadb037440fd401831dcc3165d4a28246ec7 (diff)
downloadportage-aa8ff193675224cd110c3c489e561e8e8e30eab3.tar.gz
portage-aa8ff193675224cd110c3c489e561e8e8e30eab3.tar.bz2
portage-aa8ff193675224cd110c3c489e561e8e8e30eab3.zip
depgraph: always check for autounmask breakage
The 2.1.9 branch already does the same thing since commit 65736474c0d70cb10ff1290b3787b61d8a502aed.
-rw-r--r--pym/_emerge/depgraph.py19
1 files changed, 10 insertions, 9 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index d7ddd1af0..3dc68ff7c 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -6673,15 +6673,16 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp
allow_backtracking=False,
backtrack_parameters=backtracker.get_best_run())
success, favorites = mydepgraph.select_files(myfiles)
- if not success and mydepgraph.autounmask_breakage_detected():
- if "--debug" in myopts:
- writemsg_level(
- "\n\nautounmask breakage detected\n\n",
- noiselevel=-1, level=logging.DEBUG)
- myopts["--autounmask"] = "n"
- mydepgraph = depgraph(settings, trees, myopts, myparams, spinner,
- frozen_config=frozen_config, allow_backtracking=False)
- success, favorites = mydepgraph.select_files(myfiles)
+
+ if not success and mydepgraph.autounmask_breakage_detected():
+ if "--debug" in myopts:
+ writemsg_level(
+ "\n\nautounmask breakage detected\n\n",
+ noiselevel=-1, level=logging.DEBUG)
+ myopts["--autounmask"] = "n"
+ mydepgraph = depgraph(settings, trees, myopts, myparams, spinner,
+ frozen_config=frozen_config, allow_backtracking=False)
+ success, favorites = mydepgraph.select_files(myfiles)
return (success, mydepgraph, favorites)