| 1 |
Author: genone |
| 2 |
Date: 2008-05-02 05:09:48 +0000 (Fri, 02 May 2008) |
| 3 |
New Revision: 10080 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
do not consider sets to be installed that are about to be unmerged |
| 9 |
|
| 10 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 11 |
=================================================================== |
| 12 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-02 05:00:46 UTC (rev 10079) |
| 13 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-02 05:09:48 UTC (rev 10080) |
| 14 |
@@ -5852,6 +5852,7 @@ |
| 15 |
if candidates: |
| 16 |
stop = False |
| 17 |
installed_sets += candidates |
| 18 |
+ installed_sets = [x for x in installed_sets if x not in root_config.setconfig.active] |
| 19 |
del stop, pos |
| 20 |
|
| 21 |
# we don't want to unmerge packages that are still listed in user-editable package sets |
| 22 |
@@ -5992,7 +5993,7 @@ |
| 23 |
if clean_world: |
| 24 |
sets["world"].cleanPackage(vartree.dbapi, y) |
| 25 |
emergelog(xterm_titles, " >>> unmerge success: "+y) |
| 26 |
- if clean_world_ |
| 27 |
+ if clean_world: |
| 28 |
for s in root_config.setconfig.active: |
| 29 |
sets["world"].remove(SETPREFIX+s) |
| 30 |
return 1 |
| 31 |
|
| 32 |
-- |
| 33 |
gentoo-commits@l.g.o mailing list |
Archives