summaryrefslogtreecommitdiff
path: root/pym
diff options
context:
space:
mode:
authorSebastian Luther <SebastianLuther@gmx.de>2010-08-05 09:39:44 +0200
committerZac Medico <zmedico@gentoo.org>2010-08-05 01:25:38 -0700
commitf27e8b3aa5e5feec5095ee199f04b61367841979 (patch)
treecddb6d3d742f072c4289d1793248ff1b4636f4a2 /pym
parent_emerge.depgraph: Keep _needed_user_config_changes during backtracking (diff)
downloadportage-multirepo-f27e8b3aa5e5feec5095ee199f04b61367841979.tar.gz
portage-multirepo-f27e8b3aa5e5feec5095ee199f04b61367841979.tar.bz2
portage-multirepo-f27e8b3aa5e5feec5095ee199f04b61367841979.zip
_emerge.depgraph.get_backtrack_parameters(): Return a dict instead of a tuple
Diffstat (limited to 'pym')
-rw-r--r--pym/_emerge/depgraph.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 7072e18d..056c7bdb 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5538,9 +5538,13 @@ class depgraph(object):
def need_restart(self):
return self._dynamic_config._need_restart
- def get_backtrack_parameter(self):
- return self._dynamic_config._needed_user_config_changes.copy(), \
- self._dynamic_config._runtime_pkg_mask.copy()
+ def get_backtrack_parameters(self):
+ return {
+ "needed_user_config_changes":
+ self._dynamic_config._needed_user_config_changes.copy(), \
+ "runtime_pkg_mask":
+ self._dynamic_config._runtime_pkg_mask.copy()
+ }
class _dep_check_composite_db(dbapi):
@@ -5787,8 +5791,9 @@ def _backtrack_depgraph(settings, trees, myopts, myparams,
success, favorites = mydepgraph.select_files(myfiles)
if not success:
if mydepgraph.need_restart() and backtracked < backtrack_max:
- needed_user_config_changes, runtime_pkg_mask = \
- mydepgraph.get_backtrack_parameter()
+ backtrack_parameters = mydepgraph.get_backtrack_parameter()
+ needed_user_config_changes = backtrack_parameters["needed_user_config_changes"]
+ runtime_pkg_mask = backtrack_parameters["runtime_pkg_mask"]
backtracked += 1
elif backtracked and allow_backtracking:
if "--debug" in myopts: