--buildpkgonly will not merge anything, so

it cancels all binary package options.

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

diff --git a/bin/emerge b/bin/emerge
index 49204d9bed7620332952b6974696adbb6e0ef40d..89dd817522026b6f49dbe4cfb6962b97d3164a00 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -6399,6 +6399,13 @@ def emerge_main():
        if ("getbinpkg" in settings.features):
                myopts["--getbinpkg"] = True
 
+       if "--buildpkgonly" in myopts:
+               # --buildpkgonly will not merge anything, so
+               # it cancels all binary package options.
+               for opt in ("--getbinpkg", "--getbinpkgonly",
+                       "--usepkg", "--usepkgonly"):
+                       myopts.pop(opt, None)
+
        if "--skipfirst" in myopts and "--resume" not in myopts:
                myopts["--resume"] = True