Bug #288533 - Make WorldSet automatically include @system.

svn path=/main/branches/2.1.7/; revision=14569

diff --git a/pym/portage/_sets/files.py b/pym/portage/_sets/files.py
index 77793baa0868d17a8bfbab5b5d3963d84c44bdb9..396c2c17db5abfeb3037c730e0d95e474b8899a4 100644 (file)
--- a/pym/portage/_sets/files.py
+++ b/pym/portage/_sets/files.py
@@ -44,6 +44,7 @@ class WorldSet(EditablePackageSet):
 
        def load(self):
                atoms = []
+               nonatoms = ["@system"]
                atoms_changed = False
                # load atoms and non-atoms from different files so the worldfile is 
                # backwards-compatible with older versions and other PMs, even though 
@@ -70,7 +71,7 @@ class WorldSet(EditablePackageSet):
                        atoms.extend(self._atoms)
 
                if atoms_changed:
-                       self._setAtoms(atoms)
+                       self._setAtoms(atoms+nonatoms)
                
        def _ensure_dirs(self):
                ensure_dirs(os.path.dirname(self._filename), gid=portage_gid, mode=0o2750, mask=0o2)