Ensure backtrack loop termination.

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 3ed81e4458e7b1edd69fba92326e1337a6f1ab9d..054dc8ca09c9c7b9a22f1155a8684bc8b83f1cb4 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5531,11 +5531,15 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp
 
                if success or mydepgraph.success_without_autounmask():
                        break
+               elif not allow_backtracking:
+                       break
                elif backtracked > max_retries:
                        break
                elif mydepgraph.need_restart():
                        backtracked += 1
-                       backtracker.feedback(mydepgraph.get_backtrack_infos())  
+                       backtracker.feedback(mydepgraph.get_backtrack_infos())
+               else:
+                       break
 
        if not (success or mydepgraph.success_without_autounmask()) and backtracked: