summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-05-08 11:24:40 -0700
committerZac Medico <zmedico@gentoo.org>2011-05-08 11:24:40 -0700
commit98b0a31bf0c3cc9dce6788eae4beee04ce354791 (patch)
tree281244614445a6aeadd31aaf194f38b10cbc4289
parent05b16b9d1c4eacc3442b78152f46f5d07943de97 (diff)
downloadportage-98b0a31bf0c3cc9dce6788eae4beee04ce354791.tar.gz
portage-98b0a31bf0c3cc9dce6788eae4beee04ce354791.tar.bz2
portage-98b0a31bf0c3cc9dce6788eae4beee04ce354791.zip
resume_depgraph: don't call break_refs in loop
The break_refs call was unnecessary and it broke the state of the frozen_config instance, causing the following error: File "pym/_emerge/depgraph.py", line 1290, in _wrapped_add_pkg_dep_string inst_pkgs = vardb.match_pkgs(atom) AttributeError: 'vardbapi' object has no attribute 'match_pkgs'
-rw-r--r--pym/_emerge/depgraph.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 1f80d0cd5..83d6e9b9a 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -4606,7 +4606,7 @@ class depgraph(object):
Break any references in Package instances that lead back to the depgraph.
This is useful if you want to hold references to packages without also
holding the depgraph on the heap. It should only be called after the
- depgraph will not be used for any more calculations.
+ depgraph and _frozen_config will not be used for any more calculations.
"""
for root_config in self._frozen_config.roots.values():
root_config.update(self._frozen_config._trees_orig[
@@ -6421,7 +6421,6 @@ def _resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner):
# package has already been installed.
dropped_tasks.update(pkg for pkg in \
unsatisfied_parents if pkg.operation != "nomerge")
- mydepgraph.break_refs()
del e, graph, traversed_nodes, \
unsatisfied_parents, unsatisfied_stack