Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r12495 - main/trunk/pym/portage
Date: Tue, 13 Jan 2009 21:02:35
Message-Id: E1LMqP9-0008MT-Tl@stork.gentoo.org
Author: zmedico
Date: 2009-01-13 21:02:30 +0000 (Tue, 13 Jan 2009)
New Revision: 12495

Modified:
   main/trunk/pym/portage/__init__.py
Log:
Bug #254860 - Inside _expand_new_virtuals(), generate instances of Atom
instead of plain strings, so calling code can assume that only Atom instances
will be returned when strict mode is enabled.


Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py	2009-01-13 04:43:40 UTC (rev 12494)
+++ main/trunk/pym/portage/__init__.py	2009-01-13 21:02:30 UTC (rev 12495)
@@ -6364,13 +6364,14 @@
 				if len(virtual_atoms) == 1:
 					# It wouldn't make sense to block all the components of a
 					# compound virtual, so only a single atom block is allowed.
-					a.append("!" + virtual_atoms[0])
+					a.append(portage.dep.Atom("!" + virtual_atoms[0]))
 			else:
-				mycheck[1].append("="+y[0]) # pull in the new-style virtual
+				# pull in the new-style virtual
+				mycheck[1].append(portage.dep.Atom("="+y[0]))
 				a.append(mycheck[1])
 		# Plain old-style virtuals.  New-style virtuals are preferred.
 		for y in mychoices:
-			a.append(x.replace(mykey, y))
+			a.append(portage.dep.Atom(x.replace(mykey, y, 1)))
 		if isblocker and not a:
 			# Probably a compound virtual.  Pass the atom through unprocessed.
 			newsplit.append(x)