diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-08-30 19:31:48 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-08-30 19:31:48 -0700 |
| commit | c47394cb28a841d5b7399f548c2507a85a158bdd (patch) | |
| tree | 36be505a630206827c6919dea4f6d93468b44763 /pym/_emerge/main.py | |
| parent | c7ff6c61e86127068ba6abe6aaa094e56c2d7555 (diff) | |
| download | portage-c47394cb28a841d5b7399f548c2507a85a158bdd.tar.gz portage-c47394cb28a841d5b7399f548c2507a85a158bdd.tar.bz2 portage-c47394cb28a841d5b7399f548c2507a85a158bdd.zip | |
Respect package.env buildpkg FEATURES settings.
This will fix bug #318897.
Diffstat (limited to 'pym/_emerge/main.py')
| -rw-r--r-- | pym/_emerge/main.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 84c4c58b8..343fd5812 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1545,6 +1545,11 @@ def emerge_main(args=None): settings, trees, mtimedb = load_emerge_config(trees=trees) portdb = trees[settings["ROOT"]]["porttree"].dbapi + # NOTE: adjust_configs() can map options to FEATURES, so any relevant + # options adjustments should be made prior to calling adjust_configs(). + if "--buildpkgonly" in myopts: + myopts["--buildpkg"] = True + adjust_configs(myopts, trees) apply_priorities(settings) @@ -1587,9 +1592,6 @@ def emerge_main(args=None): if "--usepkgonly" in myopts: myopts["--usepkg"] = True - if "buildpkg" in settings.features or "--buildpkgonly" in myopts: - myopts["--buildpkg"] = True - if "--buildpkgonly" in myopts: # --buildpkgonly will not merge anything, so # it cancels all binary package options. |