[gentoo-commits] proj/portage:master commit in: pym/portage/dep/

[Sebastian Luther]

commit:     d8345b546c4212d928b38b972921879ef9fa466c
Author:     Sebastian Luther <SebastianLuther <AT> gmx <DOT> de>
AuthorDate: Sun Mar 30 18:54:17 2014 +0000
Commit:     Sebastian Luther <SebastianLuther <AT> gmx <DOT> de >
CommitDate: Sun Mar 30 19:00:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d8345b54

Remove some broken old-style virtual code

Fixes a crash reported on IRC

---
 pym/portage/dep/dep_check.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index b5ace3d..b79c5bc 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -91,7 +91,6 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
 			if portdb.cp_list(x.cp):
 				newsplit.append(x)
 			else:
-				# TODO: Add PROVIDE check for repoman.
 				a = []
 				myvartree = mytrees.get("vartree")
 				if myvartree is not None:
@@ -196,19 +195,6 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
 				virt_atom_node = (virt_atom, id(virt_atom))
 				atom_graph.add(virt_atom_node, graph_parent)
 				atom_graph.add(pkg, virt_atom_node)
-		# Plain old-style virtuals.  New-style virtuals are preferred.
-		if not pkgs:
-				for y in mychoices:
-					new_atom = Atom(x.replace(x.cp, y.cp, 1))
-					matches = portdb.match(new_atom)
-					# portdb is an instance of depgraph._dep_check_composite_db, so
-					# USE conditionals are already evaluated.
-					if matches and mykey in \
-						portdb.aux_get(matches[-1], ['PROVIDE'])[0].split():
-						a.append(new_atom)
-						if atom_graph is not None:
-							atom_graph.add((new_atom, id(new_atom)),
-								graph_parent)
 
 		if not a and mychoices:
 			# Check for a virtual package.provided match.