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 c70b8f81f092595b5b5f22f608b9d2a10f8ac9da..ccfaf5844b92c84a4a2843b12fbf9d07e303a3c0 100755 (executable)
--- 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))