Fix PackageSet.getAtoms() and getNonAtoms() so that they

don't return references to private data structures.

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

diff --git a/pym/portage/sets/base.py b/pym/portage/sets/base.py
index c22ee995363d9ae3860b94f27a1c3c4978e6ed41..8e5863cbaa8d4b82efd0bbe5051eaaa7e4b757d2 100644 (file)
--- a/pym/portage/sets/base.py
+++ b/pym/portage/sets/base.py
@@ -26,7 +26,8 @@ class PackageSet(object):
                self._nonatoms = set()
 
        def __contains__(self, atom):
-               return atom in self.getAtoms() or atom in self._nonatoms
+               self._load()
+               return atom in self._atoms or atom in self._nonatoms
        
        def __iter__(self):
                for x in self.getAtoms():
@@ -36,18 +37,21 @@ class PackageSet(object):
                if not op in OPERATIONS:
                        raise ValueError(op)
                return op in self._operations
-       
-       def getAtoms(self):
+
+       def _load(self):
                if not (self._loaded or self._loading):
                        self._loading = True
                        self.load()
                        self._loaded = True
                        self._loading = False
-               return self._atoms
+
+       def getAtoms(self):
+               self._load()
+               return self._atoms.copy()
 
        def getNonAtoms(self):
-               self.getAtoms()
-               return self._nonatoms
+               self._load()
+               return self._nonatoms.copy()
 
        def _setAtoms(self, atoms):
                atoms = map(str.strip, atoms)