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

really useful.

svn path=/main/trunk/; revision=10528

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 7294e78cd58f63758c9c3b3d80e5600bafcfca44..ee284170a3935e6aebe8458111caaf76f0f98a73 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5269,13 +5269,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
@@ -5315,9 +5308,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}))
@@ -5335,6 +5326,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":