Make config.features a set instead of a list. (trunk r13134)

svn path=/main/branches/2.1.6/; revision=13153

2 files changed, 6 insertions, 8 deletions

diff --git a/bin/ebuild b/bin/ebuild
index a18f257a..05ba86c0 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -186,9 +186,8 @@ if "test" in pargs:
 	tmpsettings["EBUILD_FORCE_TEST"] = "1"
 	tmpsettings.backup_changes("EBUILD_FORCE_TEST")
 	if "test" not in tmpsettings.features:
-		tmpsettings.features.append("test")
-		tmpsettings.features.sort()
-		tmpsettings["FEATURES"] = " ".join(tmpsettings.features)
+		tmpsettings.features.add("test")
+		tmpsettings["FEATURES"] = " ".join(sorted(tmpsettings.features))
 		tmpsettings.backup_changes("FEATURES")
 
 if opts.skip_manifest:
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index cc87dcf4..343a53b6 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1778,8 +1778,7 @@ class config(object):
 				if "usersandbox" in self.features:
 					self.features.remove("usersandbox")
 
-			self.features.sort()
-			self["FEATURES"] = " ".join(self.features)
+			self["FEATURES"] = " ".join(sorted(self.features))
 			self.backup_changes("FEATURES")
 
 			self._init_dirs()
@@ -2793,8 +2792,8 @@ class config(object):
 					myflags.add(var_lower + "_" + x)
 
 		if not hasattr(self, "features"):
-			self.features = sorted(set(
-				self.configlist[-1].get("FEATURES","").split()))
+			self.features = set(
+				self.configlist[-1].get("FEATURES","").split())
 		self["FEATURES"] = " ".join(self.features)
 
 		myflags.update(self.useforce)
@@ -6152,7 +6151,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 				return 1
 			# qmerge is a special phase that implies noclean.
 			if "noclean" not in mysettings.features:
-				mysettings.features.append("noclean")
+				mysettings.features.add("noclean")
 			#qmerge is specifically not supposed to do a runtime dep check
 			retval = merge(
 				mysettings["CATEGORY"], mysettings["PF"], mysettings["D"],