depgraph: always check for autounmask breakage

The 2.1.9 branch already does the same thing since commit
65736474c0d70cb10ff1290b3787b61d8a502aed.

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index d7ddd1af09911ce68a09882740c6cb5385f79c8a..3dc68ff7c1d7fd19c9ff065e636644caff182ef6 100644 (file)
--- 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)