From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 9 Apr 2008 21:12:31 +0000 (-0000)
Subject: Pull in "system" as a separate set instead of mixing it with "world".
X-Git-Tag: v2.1.5~216
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=85924d4d4464684b73bd33ce8eb310a89c66d4b6;p=portage.git

Pull in "system" as a separate set instead of mixing it with "world".

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

diff --git a/bin/emerge b/bin/emerge
index cbaf1cd1d..e038ab61f 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2334,12 +2334,17 @@ 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))
+					if s == "world":
+						# pull in the system set too
+						s = "system"
+						expanded_set = InternalPackageSet(
+							initial_atoms=getSetAtoms(s))
+						self._sets[s] = expanded_set
+						args.append(SetArg(arg=SETPREFIX+s, set=expanded_set,
+							root_config=root_config))
 					#if not oneshot:
 					#	myfavorites.append(x)
 					continue