[gentoo-commits] proj/portage:master commit in: pym/portage/_sets/

[Zac Medico]

commit:     a4784ffb9406e69811aaf21818459aff00fadb6b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  8 00:42:03 2014 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Dec  8 00:42:03 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a4784ffb

WorldSelectedSet._load: load all nested atoms/sets

Since commit 3e327e8c849cf6bfb84a3a3ec5c080ab4bc4653c,
AutounmaskTestCase.testAutounmaskAndSets fails due to incorrect logic
in WorldSelectedSet._load. Fix it to load all nested atoms/sets.

Fixes: 3e327e8c849c ("Split @selected into @selected-packages and 
@selected-sets")

---
 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 e76fa83..379ca30 100644
--- a/pym/portage/_sets/files.py
+++ b/pym/portage/_sets/files.py
@@ -222,7 +222,7 @@ class WorldSelectedSet(EditablePackageSet):
        def load(self):
                self._pkgset.load()
                self._setset.load()
-               self._setAtoms(self._pkgset._atoms | self._pkgset._nonatoms)
+               self._setAtoms(chain(self._pkgset, self._setset))
 
        def lock(self):
                self._pkgset.lock()