For consistency, pass ignore_soft_deps into digraph.hasallzeros().

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

diff --git a/bin/emerge b/bin/emerge
index 5eabf9f945c7eb38b1e87d247f7038321fa98b7f..edda52ecd0365834173814ae52a0a24a6ee66062 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3546,7 +3546,7 @@ def action_build(settings, trees, mtimedb,
                                mydepgraph.altlist(reversed=("--tree" in myopts)))
        else:
                if ("--buildpkgonly" in myopts):
-                       if not mydepgraph.digraph.hasallzeros():
+                       if not mydepgraph.digraph.hasallzeros(ignore_soft_deps=True):
                                print "\n!!! --buildpkgonly requires all dependencies to be merged."
                                print "!!! Cannot merge requested packages. Merge deps and try again.\n"
                                sys.exit(1)

diff --git a/pym/portage.py b/pym/portage.py
index a0e8a87bba5eb7e8fc6bead9304b0b21401bf8c2..c7d48205de5c594447a66d15e211e01566af04a7 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -444,8 +444,9 @@ class digraph:
                        return leaf_nodes[0]
                return None
 
-       def hasallzeros(self):
-               return len(self.leaf_nodes(ignore_soft_deps=True)) == len(self.order)
+       def hasallzeros(self, ignore_soft_deps=False):
+               return len(self.leaf_nodes(ignore_soft_deps=ignore_soft_deps)) == \
+                       len(self.order)
 
        def debug_print(self):
                for node in self.nodes: