Make favorites handling in depgraph.select_files() consistent with

SetArg handling when the "system" set is added along with "world".

svn path=/main/branches/2.1.2/; revision=10159

diff --git a/bin/emerge b/bin/emerge
index c8562d73d360ac9f1288a738382914c4d4d788e3..1819c2601ec977081b484d9e0259aabcf535debf 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2594,15 +2594,17 @@ class depgraph(object):
                                        self._sets[s] = expanded_set
                                        args.append(SetArg(arg=x, set=expanded_set,
                                                root_config=root_config))
+                                       myfavorites.append(x)
                                        if s == "world":
                                                # pull in the system set too
                                                s = "system"
+                                               x = SETPREFIX + s
                                                expanded_set = InternalPackageSet(
                                                        initial_atoms=getSetAtoms(s))
                                                self._sets[s] = expanded_set
-                                               args.append(SetArg(arg=SETPREFIX+s, set=expanded_set,
+                                               args.append(SetArg(arg=x, set=expanded_set,
                                                        root_config=root_config))
-                                       myfavorites.append(x)
+                                               myfavorites.append(x)
                                        continue
                                if not is_valid_package_atom(x):
                                        portage.writemsg("\n\n!!! '%s' is not a valid package atom.\n" % x,