Revert --buildpkgonly logic back because it was already correct. (trunk r7110)

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

diff --git a/bin/emerge b/bin/emerge
index ba0937e4a261c942cc0bc43b72d5dd02e0edd01e..bf33f583940e23f60a3d239e9a9befdd4a28e8ae 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -5207,13 +5207,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_SOFT):
+                               not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM):
                                        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_SOFT):
+                       if not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM):
                                print "\n!!! --buildpkgonly requires all dependencies to be merged."
                                print "!!! Cannot merge requested packages. Merge deps and try again.\n"
                                sys.exit(1)