Update --buildpkgonly logic to account for DepPriority.MEDIUM_SOFT.

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 4751056728c688b3f7cbc96420f49f59b6b3e6cc..819919d864e5df7aa07d37b6a76b424992595db2 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -5358,13 +5358,13 @@ def action_build(settings, trees, mtimedb,
                        mydepgraph.display(
                                mydepgraph.altlist(reversed=("--tree" in myopts)))
                        if "--buildpkgonly" in myopts and \
-                               not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM):
+                               not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM_SOFT):
                                        print "\n!!! --buildpkgonly requires all dependencies to be merged."
                                        print "!!! You have to merge the dependencies before you can build this package.\n"
                                        sys.exit(1)
        else:
                if ("--buildpkgonly" in myopts):
-                       if not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM):
+                       if not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM_SOFT):
                                print "\n!!! --buildpkgonly requires all dependencies to be merged."
                                print "!!! Cannot merge requested packages. Merge deps and try again.\n"
                                sys.exit(1)