From: Marius Mauch <genone@gentoo.org>
Date: Sun, 2 Mar 2008 14:45:52 +0000 (-0000)
Subject: stack use flags from package.use for multiple matching atoms (bug #200385)
X-Git-Tag: v2.2_pre4~38
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=29275cd759d738d11f43f0aec86a46f86f09bb23;p=portage.git

stack use flags from package.use for multiple matching atoms (bug #200385)

svn path=/main/trunk/; revision=9408
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index dfbe70fc2..c10749368 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1904,9 +1904,15 @@ class config(object):
 		self.puse = ""
 		cpdict = self.pusedict.get(cp)
 		if cpdict:
-			self.pusekey = best_match_to_list(cpv_slot, cpdict.keys())
-			if self.pusekey:
-				self.puse = " ".join(cpdict[self.pusekey])
+			keys = cpdict.keys()
+			while keys:
+				self.pusekey = best_match_to_list(cpv_slot, keys)
+				if self.pusekey:
+					keys.remove(self.pusekey)
+					self.puse += " "+" ".join(cpdict[self.pusekey])
+				else:
+					break
+			del keys
 		if oldpuse != self.puse:
 			has_changed = True
 		self.configdict["pkg"]["PKGUSE"] = self.puse[:] # For saving to PUSE file