From b991f0efbaf5c6b6a885876c3e4ddf7b0d9fe1ec Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 5 May 2006 18:10:20 +0000 Subject: Reimplement the fix for bug #79566 more cleanly (the -* hack seems quite non-intuitive). svn path=/main/trunk/; revision=3320 --- pym/portage.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'pym/portage.py') 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 -- cgit v1.2.3-1-g7c22