| 1 |
Author: zmedico |
| 2 |
Date: 2009-03-23 02:15:52 +0000 (Mon, 23 Mar 2009) |
| 3 |
New Revision: 13153 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/bin/ebuild |
| 7 |
main/branches/2.1.6/pym/portage/__init__.py |
| 8 |
Log: |
| 9 |
Make config.features a set instead of a list. (trunk r13134) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.6/bin/ebuild |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.6/bin/ebuild 2009-03-23 02:15:33 UTC (rev 13152) |
| 14 |
+++ main/branches/2.1.6/bin/ebuild 2009-03-23 02:15:52 UTC (rev 13153) |
| 15 |
@@ -186,9 +186,8 @@ |
| 16 |
tmpsettings["EBUILD_FORCE_TEST"] = "1" |
| 17 |
tmpsettings.backup_changes("EBUILD_FORCE_TEST") |
| 18 |
if "test" not in tmpsettings.features: |
| 19 |
- tmpsettings.features.append("test") |
| 20 |
- tmpsettings.features.sort() |
| 21 |
- tmpsettings["FEATURES"] = " ".join(tmpsettings.features) |
| 22 |
+ tmpsettings.features.add("test") |
| 23 |
+ tmpsettings["FEATURES"] = " ".join(sorted(tmpsettings.features)) |
| 24 |
tmpsettings.backup_changes("FEATURES") |
| 25 |
|
| 26 |
if opts.skip_manifest: |
| 27 |
|
| 28 |
Modified: main/branches/2.1.6/pym/portage/__init__.py |
| 29 |
=================================================================== |
| 30 |
--- main/branches/2.1.6/pym/portage/__init__.py 2009-03-23 02:15:33 UTC (rev 13152) |
| 31 |
+++ main/branches/2.1.6/pym/portage/__init__.py 2009-03-23 02:15:52 UTC (rev 13153) |
| 32 |
@@ -1778,8 +1778,7 @@ |
| 33 |
if "usersandbox" in self.features: |
| 34 |
self.features.remove("usersandbox") |
| 35 |
|
| 36 |
- self.features.sort() |
| 37 |
- self["FEATURES"] = " ".join(self.features) |
| 38 |
+ self["FEATURES"] = " ".join(sorted(self.features)) |
| 39 |
self.backup_changes("FEATURES") |
| 40 |
|
| 41 |
self._init_dirs() |
| 42 |
@@ -2793,8 +2792,8 @@ |
| 43 |
myflags.add(var_lower + "_" + x) |
| 44 |
|
| 45 |
if not hasattr(self, "features"): |
| 46 |
- self.features = sorted(set( |
| 47 |
- self.configlist[-1].get("FEATURES","").split())) |
| 48 |
+ self.features = set( |
| 49 |
+ self.configlist[-1].get("FEATURES","").split()) |
| 50 |
self["FEATURES"] = " ".join(self.features) |
| 51 |
|
| 52 |
myflags.update(self.useforce) |
| 53 |
@@ -6152,7 +6151,7 @@ |
| 54 |
return 1 |
| 55 |
# qmerge is a special phase that implies noclean. |
| 56 |
if "noclean" not in mysettings.features: |
| 57 |
- mysettings.features.append("noclean") |
| 58 |
+ mysettings.features.add("noclean") |
| 59 |
#qmerge is specifically not supposed to do a runtime dep check |
| 60 |
retval = merge( |
| 61 |
mysettings["CATEGORY"], mysettings["PF"], mysettings["D"], |
Archives