Fix WorldSet.cleanPackage() so that it properly preserves

nonatoms (sets) in the world file.

svn path=/main/trunk/; revision=8484

diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py
index 5b6fe88380ad4472419e495872ccbd5ac8c5526d..c6a6f74302fdb95bf778dcab1ab4ef8a678e1a08 100644 (file)
--- a/pym/portage/sets/files.py
+++ b/pym/portage/sets/files.py
@@ -170,6 +170,7 @@ class WorldSet(StaticFileSet):
                                #this doesn't match the package we're unmerging; keep it.
                                newworldlist.append(x)
 
+               newworldlist.extend(self._nonatoms)
                self.replace(newworldlist)
                self.unlock()