[gentoo-commits] portage r13881 - main/trunk/pym/portage

[gentoo-commits] portage r13881 - main/trunk/pym/portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-08-03 21:20:22 +0000 (Mon, 03 Aug 2009)
New Revision: 13881

Modified:
   main/trunk/pym/portage/__init__.py
Log:
Bug #278729 - Inside dep_zapdeps(), ignore USE dependencies since we don't
want USE settings to adversely affect || preference evaluation. Drop invalid
atoms inside _expand_new_virtuals() since we only want real Atom instances
inside dep_zapdeps().


Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py	2009-08-03 20:49:09 UTC (rev 13880)
+++ main/trunk/pym/portage/__init__.py	2009-08-03 21:20:22 UTC (rev 13881)
@@ -6918,6 +6918,9 @@
 				if portage.dep._dep_check_strict:
 					raise portage.exception.ParseError(
 						"invalid atom: '%s'" % x)
+				else:
+					# Only real Atom instances are allowed past this point.
+					continue
 			else:
 				if x.blocker and x.blocker.overlap.forbid and \
 					eapi in ("0", "1") and portage.dep._dep_check_strict:
@@ -7139,7 +7142,9 @@
 		for atom in atoms:
 			if atom[:1] == "!":
 				continue
-			avail_pkg = mydbapi.match(atom)
+			# Ignore USE dependencies here since we don't want USE
+			# settings to adversely affect || preference evaluation.
+			avail_pkg = mydbapi.match(atom.without_use)
 			if avail_pkg:
 				avail_pkg = avail_pkg[-1] # highest (ascending order)
 				avail_slot = "%s:%s" % (dep_getkey(atom),