Reapply "config: Don't directly modify FEATURES"

This reverts commit b150419. It turns out we need to keep the open coded version to avoid creating a persistent setting. See #1098 (comment) This change just adds a sorted() so we get deterministic ordering. Bug: https://bugs.gentoo.org/914441 Signed-off-by: Raul E Rangel <[email protected]> Closes: #1312 Signed-off-by: Zac Medico <[email protected]>
gentoo · Mar 24, 2024 · 72f41d0 · 72f41d0
1 parent b276077
commit 72f41d0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
@@ -2206,7 +2206,9 @@ def setcpv(self, mycpv, use_cache=None, mydb=None):
                 # "test" is in IUSE and USE=test is masked, so execution
                 # of src_test() probably is not reliable. Therefore,
                 # temporarily disable FEATURES=test just for this package.
-                self["FEATURES"] = " ".join(x for x in self.features if x != "test")
+                self["FEATURES"] = " ".join(
+                    x for x in sorted(self.features) if x != "test"
+                )
 
         # Allow _* flags from USE_EXPAND wildcards to pass through here.
         use.difference_update(