| 1 |
Author: genone |
| 2 |
Date: 2008-03-02 14:45:52 +0000 (Sun, 02 Mar 2008) |
| 3 |
New Revision: 9408 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
stack use flags from package.use for multiple matching atoms (bug #200385) |
| 9 |
|
| 10 |
Modified: main/trunk/pym/portage/__init__.py |
| 11 |
=================================================================== |
| 12 |
--- main/trunk/pym/portage/__init__.py 2008-03-02 13:44:03 UTC (rev 9407) |
| 13 |
+++ main/trunk/pym/portage/__init__.py 2008-03-02 14:45:52 UTC (rev 9408) |
| 14 |
@@ -1904,9 +1904,15 @@ |
| 15 |
self.puse = "" |
| 16 |
cpdict = self.pusedict.get(cp) |
| 17 |
if cpdict: |
| 18 |
- self.pusekey = best_match_to_list(cpv_slot, cpdict.keys()) |
| 19 |
- if self.pusekey: |
| 20 |
- self.puse = " ".join(cpdict[self.pusekey]) |
| 21 |
+ keys = cpdict.keys() |
| 22 |
+ while keys: |
| 23 |
+ self.pusekey = best_match_to_list(cpv_slot, keys) |
| 24 |
+ if self.pusekey: |
| 25 |
+ keys.remove(self.pusekey) |
| 26 |
+ self.puse += " "+" ".join(cpdict[self.pusekey]) |
| 27 |
+ else: |
| 28 |
+ break |
| 29 |
+ del keys |
| 30 |
if oldpuse != self.puse: |
| 31 |
has_changed = True |
| 32 |
self.configdict["pkg"]["PKGUSE"] = self.puse[:] # For saving to PUSE file |
| 33 |
|
| 34 |
-- |
| 35 |
gentoo-commits@l.g.o mailing list |
Archives