| 1 |
Author: genone |
| 2 |
Date: 2008-03-02 19:08:52 +0000 (Sun, 02 Mar 2008) |
| 3 |
New Revision: 9410 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
apply r9408 also for profile-base package.*use* files |
| 9 |
|
| 10 |
Modified: main/trunk/pym/portage/__init__.py |
| 11 |
=================================================================== |
| 12 |
--- main/trunk/pym/portage/__init__.py 2008-03-02 18:56:10 UTC (rev 9409) |
| 13 |
+++ main/trunk/pym/portage/__init__.py 2008-03-02 19:08:52 UTC (rev 9410) |
| 14 |
@@ -1869,9 +1869,15 @@ |
| 15 |
defaults.append(self.make_defaults_use[i]) |
| 16 |
cpdict = self.pkgprofileuse[i].get(cp, None) |
| 17 |
if cpdict: |
| 18 |
- best_match = best_match_to_list(cpv_slot, cpdict.keys()) |
| 19 |
- if best_match: |
| 20 |
- defaults.append(cpdict[best_match]) |
| 21 |
+ keys = cpdict.keys() |
| 22 |
+ while keys: |
| 23 |
+ bestmatch = best_match_to_list(cpv_slot, keys) |
| 24 |
+ if bestmatch: |
| 25 |
+ keys.remove(bestmatch) |
| 26 |
+ defaults.append(cpdict[bestmatch]) |
| 27 |
+ else: |
| 28 |
+ break |
| 29 |
+ del keys |
| 30 |
defaults = " ".join(defaults) |
| 31 |
if defaults != self.configdict["defaults"].get("USE",""): |
| 32 |
self.configdict["defaults"]["USE"] = defaults |
| 33 |
@@ -1881,9 +1887,15 @@ |
| 34 |
useforce.append(self.useforce_list[i]) |
| 35 |
cpdict = self.puseforce_list[i].get(cp, None) |
| 36 |
if cpdict: |
| 37 |
- best_match = best_match_to_list(cpv_slot, cpdict.keys()) |
| 38 |
- if best_match: |
| 39 |
- useforce.append(cpdict[best_match]) |
| 40 |
+ keys = cpdict.keys() |
| 41 |
+ while keys: |
| 42 |
+ best_match = best_match_to_list(cpv_slot, keys) |
| 43 |
+ if best_match: |
| 44 |
+ keys.remove(best_match) |
| 45 |
+ useforce.append(cpdict[best_match]) |
| 46 |
+ else: |
| 47 |
+ break |
| 48 |
+ del keys |
| 49 |
useforce = set(stack_lists(useforce, incremental=True)) |
| 50 |
if useforce != self.useforce: |
| 51 |
self.useforce = useforce |
| 52 |
@@ -1893,9 +1905,15 @@ |
| 53 |
usemask.append(self.usemask_list[i]) |
| 54 |
cpdict = self.pusemask_list[i].get(cp, None) |
| 55 |
if cpdict: |
| 56 |
- best_match = best_match_to_list(cpv_slot, cpdict.keys()) |
| 57 |
- if best_match: |
| 58 |
- usemask.append(cpdict[best_match]) |
| 59 |
+ keys = cpdict.keys() |
| 60 |
+ while keys: |
| 61 |
+ best_match = best_match_to_list(cpv_slot, cpdict.keys()) |
| 62 |
+ if best_match: |
| 63 |
+ keys.remove(best_match) |
| 64 |
+ usemask.append(cpdict[best_match]) |
| 65 |
+ else: |
| 66 |
+ break |
| 67 |
+ del keys |
| 68 |
usemask = set(stack_lists(usemask, incremental=True)) |
| 69 |
if usemask != self.usemask: |
| 70 |
self.usemask = usemask |
| 71 |
|
| 72 |
-- |
| 73 |
gentoo-commits@l.g.o mailing list |
Archives