summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-04-30 08:40:58 +0000
committerZac Medico <zmedico@gentoo.org>2008-04-30 08:40:58 +0000
commit523c136a357972541e029fef11397fb2684ca128 (patch)
tree4ef07c73cb763a8c359ca3ecba7787fbef555943
parent* Fix dep_check() so that it doesn't expand virtual blockers since the (diff)
downloadportage-multirepo-523c136a357972541e029fef11397fb2684ca128.tar.gz
portage-multirepo-523c136a357972541e029fef11397fb2684ca128.tar.bz2
portage-multirepo-523c136a357972541e029fef11397fb2684ca128.zip
Fix logic to re-use blockers from the graph when populating the blocker cache.
svn path=/main/trunk/; revision=10042
-rw-r--r--pym/_emerge/__init__.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 454cce34..d2ac8890 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3183,6 +3183,11 @@ class depgraph(object):
if not blockers.symmetric_difference(
blocker_data.atoms):
continue
+ blocker_data = None
+
+ if blocker_data is None and \
+ blockers is not None:
+ # Re-use the blockers from the graph.
blocker_atoms = sorted(blockers)
counter = long(node.metadata["COUNTER"])
blocker_data = \