From 35d0496da473d3e680f2ad73aa43d09e0b8f44b1 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 31 May 2008 23:16:16 +0000
Subject: Make PackageSet._setAtoms() use existing Atom instances when
 available. (trunk r10523)

svn path=/main/branches/2.1.2/; revision=10524
---
 bin/emerge | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/bin/emerge b/bin/emerge
index 22b91130..818cf11c 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -791,11 +791,17 @@ class InternalPackageSet(object):
 		self._atoms.clear()
 		self._nonatoms.clear()
 	def add(self, atom):
-		try:
-			atom = portage_dep.Atom(atom)
-		except portage_exception.InvalidAtom:
-			self._nonatoms.add(atom)
-			return
+		if not isinstance(atom, portage_dep.Atom):
+			if isinstance(atom, basestring):
+				atom = atom.strip()
+			if not atom:
+				return
+			try:
+				atom = portage_dep.Atom(atom)
+			except portage_exception.InvalidAtom:
+				self._nonatoms.add(atom)
+				return
+
 		cp_list = self._atoms.get(atom.cp)
 		if cp_list is None:
 			cp_list = []
-- 
cgit v1.2.3-65-gdbad