Revert changes wrt argument atoms in the previous commit since it's not

really useful. (trunk r10528)

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

diff --git a/bin/emerge b/bin/emerge
index c99710821a7536ee1c2ef186cfd7d5feb2c395f8..29832cf4acf1720453f63924d5fd21334ec36585 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -5362,13 +5362,6 @@ class depgraph(object):
                if not isinstance(mergelist, list):
                        mergelist = []
 
-               favorites = resume_data.get("favorites")
-               args_set = self._sets["args"]
-               if isinstance(favorites, list):
-                       args = self._load_favorites(favorites)
-               else:
-                       args = []
-
                skipfirst = "--skipfirst" in self.myopts
                fakedb = self.mydbapi
                trees = self.trees
@@ -5408,9 +5401,7 @@ class depgraph(object):
                        if "merge" == pkg.operation and \
                                not visible(root_config.settings, pkg):
                                if skipfirst:
-                                       atom = args_set.findAtomForPackage(pkg)
-                                       masked_tasks.append(Dependency(atom=atom,
-                                               root=pkg.root, parent=pkg))
+                                       masked_tasks.append(Dependency(root=pkg.root, parent=pkg))
                                else:
                                        self._unsatisfied_deps_for_display.append(
                                                ((pkg.root, "="+pkg.cpv), {"myparent":None}))
@@ -5428,6 +5419,13 @@ class depgraph(object):
                        self._select_package = self._select_pkg_from_graph
                        self.myparams.add("selective")
 
+                       favorites = resume_data.get("favorites")
+                       args_set = self._sets["args"]
+                       if isinstance(favorites, list):
+                               args = self._load_favorites(favorites)
+                       else:
+                               args = []
+
                        for task in serialized_tasks:
                                if isinstance(task, Package) and \
                                        task.operation == "merge":