[patch] convert str to Atom where appropriate

str_to_atom.patch (text/plain), 1.19 KB, created by Zac Medico on 2009-01-13 22:23:46 UTC

Index: pym/portage/__init__.py
===================================================================
--- pym/portage/__init__.py	(revision 12494)
+++ pym/portage/__init__.py	(revision 12497)
@@ -6333,7 +6333,7 @@
 			newsplit.append(x)
 			continue
 		if not pkgs and len(mychoices) == 1:
-			newsplit.append(x.replace(mykey, mychoices[0]))
+			newsplit.append(portage.dep.Atom(x.replace(mykey, mychoices[0])))
 			continue
 		if isblocker:
 			a = []
@@ -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)