summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-05 03:46:20 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-05 03:46:20 -0700
commit293bd0e85326a22effb5f10d1489014ecc617e59 (patch)
treee87e8f0a1b3eee198ba291f6003fd9f6c9abe944
parent03a201256ab9a8557862e30732ecc9b7de19a885 (diff)
downloadportage-293bd0e85326a22effb5f10d1489014ecc617e59.tar.gz
portage-293bd0e85326a22effb5f10d1489014ecc617e59.tar.bz2
portage-293bd0e85326a22effb5f10d1489014ecc617e59.zip
Simplify passing of the backtracking parameters from one graph
to the next.
-rw-r--r--pym/_emerge/depgraph.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 05c108592..aeaee0fcb 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5801,7 +5801,7 @@ def _backtrack_depgraph(settings, trees, myopts, myparams,
myaction, myfiles, spinner):
backtrack_max = myopts.get('--backtrack', 5)
- runtime_pkg_mask = None
+ backtrack_parameters = {}
needed_user_config_changes = None
allow_backtracking = backtrack_max > 0
backtracked = 0
@@ -5811,14 +5811,11 @@ def _backtrack_depgraph(settings, trees, myopts, myparams,
mydepgraph = depgraph(settings, trees, myopts, myparams, spinner,
frozen_config=frozen_config,
allow_backtracking=allow_backtracking,
- needed_user_config_changes=needed_user_config_changes,
- runtime_pkg_mask=runtime_pkg_mask)
+ **backtrack_parameters)
success, favorites = mydepgraph.select_files(myfiles)
if not success:
if mydepgraph.need_restart() and backtracked < backtrack_max:
- backtrack_parameters = mydepgraph.get_backtrack_parameter()
- needed_user_config_changes = backtrack_parameters["needed_user_config_changes"]
- runtime_pkg_mask = backtrack_parameters["runtime_pkg_mask"]
+ backtrack_parameters = mydepgraph.get_backtrack_parameters()
backtracked += 1
elif backtracked and allow_backtracking:
if "--debug" in myopts:
@@ -5831,7 +5828,7 @@ def _backtrack_depgraph(settings, trees, myopts, myparams,
#Don't reset needed_user_config_changes here, since we don't want to
#send the user through a "one step at a time" unmasking session for
#no good reason.
- runtime_pkg_mask = None
+ backtrack_parameters.pop('runtime_pkg_mask', None)
else:
break
else: