commit:     2c7a6e862589c8f426a69c910a84991d4b8d3d5b
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 11 16:13:34 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Feb 11 16:16:49 2015 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2c7a6e86

Revert "WorldSelectedSet._load: load all nested atoms/sets"

This reverts commit a4784ffb9406e69811aaf21818459aff00fadb6b.
This commit destroys the world file when you emerge multiple pkgs.
It saves only the last file merged.
Bug 539746.

---
 pym/portage/_sets/files.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/portage/_sets/files.py b/pym/portage/_sets/files.py
index 9d25280..6bf05d4 100644
--- a/pym/portage/_sets/files.py
+++ b/pym/portage/_sets/files.py
@@ -223,7 +223,7 @@ class WorldSelectedSet(EditablePackageSet):
        def load(self):
                self._pkgset.load()
                self._setset.load()
-               self._setAtoms(chain(self._pkgset, self._setset))
+               self._setAtoms(self._pkgset._atoms | self._pkgset._nonatoms)
 
        def lock(self):
                self._pkgset.lock()

Reply via email to