From: Marius Mauch <genone@gentoo.org>
Date: Mon, 16 Jul 2007 07:38:19 +0000 (-0000)
Subject: fix load logic for editable sets once more
X-Git-Tag: v2.2_pre1~1018
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc7fb26b67cb64b2ef1c8776be15ec253530a7b0;p=portage.git

fix load logic for editable sets once more

svn path=/main/trunk/; revision=7274
---

diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py
index 2b48ca6cb..d355823cd 100644
--- a/pym/portage/sets/__init__.py
+++ b/pym/portage/sets/__init__.py
@@ -31,10 +31,8 @@ class PackageSet(object):
 	
 	def getAtoms(self):
 		if not self._loaded:
-			# Order is important for the next two statements as load() may change
-			# _loaded to a more specific value for editable subclasses
-			self._loaded = True
 			self.load()
+			self._loaded = True
 		return self._atoms
 
 	def _setAtoms(self, atoms):
@@ -63,6 +61,10 @@ class PackageSet(object):
 	
 
 class EditablePackageSet(PackageSet):
+	def getAtoms(self):
+		self.load()
+		return self._atoms
+
 	def updateAtoms(self, atoms):
 		self.load()
 		self._atoms.update(atoms)