From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 11 Oct 2009 19:43:30 +0000 (-0000)
Subject: Bug #288533 - Make WorldSet automatically include @system.
X-Git-Tag: v2.1.7.1~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1a53b8d9a160ba92185d94ae56487fc888887b7c;p=portage.git

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 77793baa0..396c2c17d 100644
--- 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)