| 1 |
Author: genone |
| 2 |
Date: 2008-05-02 04:57:52 +0000 (Fri, 02 May 2008) |
| 3 |
New Revision: 10078 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
main/trunk/pym/portage/sets/base.py |
| 8 |
Log: |
| 9 |
properly remove sets from 'world' when unmerging |
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-02 04:17:52 UTC (rev 10077) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-02 04:57:52 UTC (rev 10078) |
| 15 |
@@ -5991,6 +5991,8 @@ |
| 16 |
else: |
| 17 |
if clean_world: |
| 18 |
sets["world"].cleanPackage(vartree.dbapi, y) |
| 19 |
+ for s in root_config.setconfig.active: |
| 20 |
+ sets["world"].remove(SETPREFIX+s) |
| 21 |
emergelog(xterm_titles, " >>> unmerge success: "+y) |
| 22 |
return 1 |
| 23 |
|
| 24 |
|
| 25 |
Modified: main/trunk/pym/portage/sets/base.py |
| 26 |
=================================================================== |
| 27 |
--- main/trunk/pym/portage/sets/base.py 2008-05-02 04:17:52 UTC (rev 10077) |
| 28 |
+++ main/trunk/pym/portage/sets/base.py 2008-05-02 04:57:52 UTC (rev 10078) |
| 29 |
@@ -183,6 +183,7 @@ |
| 30 |
def remove(self, atom): |
| 31 |
self._load() |
| 32 |
self._atoms.discard(atom) |
| 33 |
+ self._nonatoms.discard(atom) |
| 34 |
self._updateAtomMap() |
| 35 |
self.write() |
| 36 |
|
| 37 |
|
| 38 |
-- |
| 39 |
gentoo-commits@l.g.o mailing list |
Archives