From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 5 May 2006 18:10:20 +0000 (-0000)
Subject: Reimplement the fix for bug #79566 more cleanly (the -* hack seems quite non-intuitive).
X-Git-Tag: v2.1_rc1~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b991f0efbaf5c6b6a885876c3e4ddf7b0d9fe1ec;p=portage.git

Reimplement the fix for bug #79566 more cleanly (the -* hack seems quite non-intuitive).

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

diff --git a/pym/portage.py b/pym/portage.py
index d9a0ea982..339d96b94 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1316,7 +1316,7 @@ class config:
 				self.features.remove("usersandbox")
 
 		self.features.sort()
-		self["FEATURES"] = " ".join(["-*"]+self.features)
+		self["FEATURES"] = " ".join(self.features)
 		self.backup_changes("FEATURES")
 
 		if not len(self["CBUILD"]) and len(self["CHOST"]):
@@ -1503,6 +1503,14 @@ class config:
 			myincrementals=["USE"]
 		else:
 			myincrementals=portage_const.INCREMENTALS
+
+		# If self.features exists, it has already been stacked and may have
+		# been mutated, so don't stack it again or else any mutations will be
+		# reverted.
+		if "FEATURES" in myincrementals and hasattr(self, "features"):
+			myincrementals = set(myincrementals)
+			myincrementals.remove("FEATURES")
+
 		for mykey in myincrementals:
 			if mykey=="USE":
 				mydbs=self.uvlist