Revert virtual slot update code for bug 382557.
authorZac Medico <zmedico@gentoo.org>
Sun, 11 Sep 2011 17:30:56 +0000 (10:30 -0700)
committerZac Medico <zmedico@gentoo.org>
Sun, 11 Sep 2011 17:30:56 +0000 (10:30 -0700)
This reverts the behavior change from commit
21330075f07248765016e104b3ba8216903f1ecb, since it's too aggressive in
pulling in new virtual slots that may have masked dependencies.

pym/_emerge/depgraph.py

index 2c3960808b84dabc13534d2101ff97dec3806e60..6a04a7971487a3119d7290e3b85f9517bf0ae766 100644 (file)
@@ -6540,7 +6540,6 @@ class _dep_check_composite_db(dbapi):
 
                if pkg is not None and \
                        atom.slot is None and \
-                       "--update" not in self._depgraph._frozen_config.myopts and \
                        pkg.cp.startswith("virtual/"):
                        # For new-style virtual lookahead that occurs inside dep_check()
                        # for bug #141118, examine all slots. This is needed so that newer