diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-11-26 11:59:47 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-11-26 11:59:47 +0000 |
commit | 3edcda026f69d5fd1b54900474a5918da7cd1821 (patch) | |
tree | 9c9deca862b9ac7f64318e23286b08fa52dd3b43 | |
parent | 639741c0eb011ba39231e28bd6e76e5fc8ccdc0c (diff) | |
download | portage-3edcda026f69d5fd1b54900474a5918da7cd1821.tar.gz portage-3edcda026f69d5fd1b54900474a5918da7cd1821.tar.bz2 portage-3edcda026f69d5fd1b54900474a5918da7cd1821.zip |
--buildpkgonly will not merge anything, so
it cancels all binary package options.
svn path=/main/branches/2.1.2/; revision=8685
-rwxr-xr-x | bin/emerge | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge index 49204d9be..89dd81752 100755 --- 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 |