From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 1 Sep 2010 05:31:24 +0000 (-0700)
Subject: Fix WorldSelectedSet._load2() to always return a list instead of a
X-Git-Tag: v2.2_rc73~9
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=31cdef0abb5e060e8dff1458f2fae4d765041fb7;p=portage.git

Fix WorldSelectedSet._load2() to always return a list instead of a
set for nonatoms so that we don't trigger 'TypeError: can only
concatenate list (not "set") to list'.
---

diff --git a/pym/portage/_sets/files.py b/pym/portage/_sets/files.py
index e880c1eff..c474f1b5f 100644
--- a/pym/portage/_sets/files.py
+++ b/pym/portage/_sets/files.py
@@ -291,7 +291,7 @@ class WorldSelectedSet(EditablePackageSet):
 			self._mtime2 = mtime
 			changed = True
 		else:
-			nonatoms = self._nonatoms
+			nonatoms = list(self._nonatoms)
 
 		return changed, nonatoms