summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-09-11 10:30:56 -0700
committerZac Medico <zmedico@gentoo.org>2011-09-11 10:30:56 -0700
commita83f1864180ac88675bfd633617d835e9e42c1de (patch)
treec0dd1919d5514627b3b954ebe0cba8560b82a8a8 /pym
parent88438656a7b3b5824369043792ce27e63eb76f46 (diff)
downloadportage-a83f1864180ac88675bfd633617d835e9e42c1de.tar.gz
portage-a83f1864180ac88675bfd633617d835e9e42c1de.tar.bz2
portage-a83f1864180ac88675bfd633617d835e9e42c1de.zip
Revert virtual slot update code for bug 382557.
This reverts the behavior change from commit 21330075f07248765016e104b3ba8216903f1ecb, since it's too aggressive in pulling in new virtual slots that may have masked dependencies.
Diffstat (limited to 'pym')
-rw-r--r--pym/_emerge/depgraph.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 2c3960808..6a04a7971 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -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