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 cbaf1cd1d757a2921c4795ba8e7edd65b66a38e7..e038ab61f039db39d902ae1b9b726b8216ab7752 100755 (executable)
--- 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