From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 9 Apr 2008 20:39:26 +0000 (-0000)
Subject: Add system atoms to world since we're trying to emulate behavior of older
X-Git-Tag: v2.1.5~218
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0c9e6aea28c9ee9d42a36d90c58a3f3f38a8416;p=portage.git

Add system atoms to world since we're trying to emulate behavior of older
portage (rather than the latest behavior which is different).

svn path=/main/branches/2.1.2/; revision=9782
---

diff --git a/bin/emerge b/bin/emerge
index c70b8f81f..ccfaf5844 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2334,6 +2334,9 @@ class depgraph(object):
 					# sets (like if world contains system).
 					expanded_set = InternalPackageSet(
 						initial_atoms=getSetAtoms(s))
+					if s == "world":
+						# add the system set to the world set
+						expanded_set.update(getSetAtoms("system"))
 					self._sets[s] = expanded_set
 					args.append(SetArg(arg=x, set=expanded_set,
 						root_config=root_config))