resume_depgraph: don't call break_refs in loop
authorZac Medico <zmedico@gentoo.org>
Sun, 8 May 2011 18:24:40 +0000 (11:24 -0700)
committerZac Medico <zmedico@gentoo.org>
Sun, 8 May 2011 18:55:41 +0000 (11:55 -0700)
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'

pym/_emerge/depgraph.py

index 23197db3610c04401f6667e0422919f470e49132..0c36e3a3120d86be03da677db5954902215d2803 100644 (file)
@@ -4250,7 +4250,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[
@@ -6023,7 +6023,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