From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-44553-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1JVpRr-0007CK-8t
	for garchives@archives.gentoo.org; Sun, 02 Mar 2008 14:45:55 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 9ED81E0732;
	Sun,  2 Mar 2008 14:45:54 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 7A6D7E0702
	for <gentoo-commits@lists.gentoo.org>; Sun,  2 Mar 2008 14:45:54 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id 2BAF666810
	for <gentoo-commits@lists.gentoo.org>; Sun,  2 Mar 2008 14:45:54 +0000 (UTC)
Received: from genone by stork.gentoo.org with local (Exim 4.68)
	(envelope-from <genone@stork.gentoo.org>)
	id 1JVpRp-0002gv-5x
	for gentoo-commits@lists.gentoo.org; Sun, 02 Mar 2008 14:45:53 +0000
To: gentoo-commits@lists.gentoo.org
From: "Marius Mauch (genone)" <genone@gentoo.org>
Subject: [gentoo-commits] portage r9408 - main/trunk/pym/portage
X-VCS-Repository: portage
X-VCS-Revision: 9408
X-VCS-Files: main/trunk/pym/portage/__init__.py
X-VCS-Directories: main/trunk/pym/portage
X-VCS-Committer: genone
X-VCS-Committer-Name: Marius Mauch
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1JVpRp-0002gv-5x@stork.gentoo.org>
Sender: Marius Mauch <genone@stork.gentoo.org>
Date: Sun, 02 Mar 2008 14:45:53 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 99a8a067-6bbb-417c-8a53-c995176f1667
X-Archives-Hash: 906cf4d16b14fd88b9fc7239a452345c

Author: genone
Date: 2008-03-02 14:45:52 +0000 (Sun, 02 Mar 2008)
New Revision: 9408

Modified:
   main/trunk/pym/portage/__init__.py
Log:
stack use flags from package.use for multiple matching atoms (bug #200385=
)

Modified: main/trunk/pym/portage/__init__.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/trunk/pym/portage/__init__.py	2008-03-02 13:44:03 UTC (rev 9407)
+++ main/trunk/pym/portage/__init__.py	2008-03-02 14:45:52 UTC (rev 9408)
@@ -1904,9 +1904,15 @@
 		self.puse =3D ""
 		cpdict =3D self.pusedict.get(cp)
 		if cpdict:
-			self.pusekey =3D best_match_to_list(cpv_slot, cpdict.keys())
-			if self.pusekey:
-				self.puse =3D " ".join(cpdict[self.pusekey])
+			keys =3D cpdict.keys()
+			while keys:
+				self.pusekey =3D best_match_to_list(cpv_slot, keys)
+				if self.pusekey:
+					keys.remove(self.pusekey)
+					self.puse +=3D " "+" ".join(cpdict[self.pusekey])
+				else:
+					break
+			del keys
 		if oldpuse !=3D self.puse:
 			has_changed =3D True
 		self.configdict["pkg"]["PKGUSE"] =3D self.puse[:] # For saving to PUSE=
 file

--=20
gentoo-commits@lists.gentoo.org mailing list