To optimize consistency of atom selections, add all of the root packages

to the graph before processing any dependencies.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 13dfa8985f1de3f661caf6474a7a2ee7fad7d70c..e51534fe63e14c4a6e143b2636fc15c1c1066dbe 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2388,6 +2388,7 @@ class depgraph(object):
                while args:
                        arg = args.pop()
                        for atom in arg.set:
+                               self.spinner.update()
                                atom_cp = portage.dep_getkey(atom)
                                try:
                                        pprovided = pprovideddict.get(portage.dep_getkey(atom))
@@ -2438,16 +2439,12 @@ class depgraph(object):
 
                                        dep = Dependency(atom=atom, onlydeps=onlydeps,
                                                root=myroot, parent=arg)
-                                       self._dep_stack.append(dep)
 
                                        # Add the selected package to the graph as soon as possible
                                        # so that later dep_check() calls can use it as feedback
                                        # for making more consistent atom selections.
                                        if not self._add_pkg(pkg, dep.parent,
                                                priority=dep.priority, depth=dep.depth):
-                                               return 0, myfavorites
-
-                                       if not self._create_graph():
                                                if isinstance(arg, SetArg):
                                                        sys.stderr.write(("\n\n!!! Problem resolving " + \
                                                                "dependencies for %s from %s\n") % \
@@ -2456,6 +2453,7 @@ class depgraph(object):
                                                        sys.stderr.write(("\n\n!!! Problem resolving " + \
                                                                "dependencies for %s\n") % atom)
                                                return 0, myfavorites
+
                                except portage.exception.MissingSignature, e:
                                        portage.writemsg("\n\n!!! A missing gpg signature is preventing portage from calculating the\n")
                                        portage.writemsg("!!! required dependencies. This is a security feature enabled by the admin\n")
@@ -2477,6 +2475,11 @@ class depgraph(object):
                                        print >> sys.stderr, "!!!", str(e), getattr(e, "__module__", None)
                                        raise
 
+               # Now that the root packages have been added to the graph,
+               # process the dependencies.
+               if not self._create_graph():
+                       return 0, myfavorites
+
                missing=0
                if "--usepkgonly" in self.myopts:
                        for xs in self.digraph.all_nodes():