1 |
commit: c47394cb28a841d5b7399f548c2507a85a158bdd |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 31 02:31:48 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 31 02:31:48 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c47394cb |
7 |
|
8 |
Respect package.env buildpkg FEATURES settings. |
9 |
|
10 |
This will fix bug #318897. |
11 |
|
12 |
--- |
13 |
pym/_emerge/EbuildBuild.py | 2 +- |
14 |
pym/_emerge/actions.py | 3 +++ |
15 |
pym/_emerge/main.py | 8 +++++--- |
16 |
3 files changed, 9 insertions(+), 4 deletions(-) |
17 |
|
18 |
diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py |
19 |
index 0144cfc..2b0f412 100644 |
20 |
--- a/pym/_emerge/EbuildBuild.py |
21 |
+++ b/pym/_emerge/EbuildBuild.py |
22 |
@@ -225,7 +225,7 @@ class EbuildBuild(CompositeTask): |
23 |
system_set.findAtomForPackage(pkg) and \ |
24 |
not opts.buildpkg |
25 |
|
26 |
- if opts.buildpkg or self._issyspkg: |
27 |
+ if opts.buildpkg or "buildpkg" in features or self._issyspkg: |
28 |
|
29 |
self._buildpkg = True |
30 |
|
31 |
|
32 |
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py |
33 |
index 882a2db..3477c19 100644 |
34 |
--- a/pym/_emerge/actions.py |
35 |
+++ b/pym/_emerge/actions.py |
36 |
@@ -2731,6 +2731,9 @@ def adjust_config(myopts, settings): |
37 |
settings["EMERGE_WARNING_DELAY"] = str(EMERGE_WARNING_DELAY) |
38 |
settings.backup_changes("EMERGE_WARNING_DELAY") |
39 |
|
40 |
+ if "--buildpkg" in myopts: |
41 |
+ settings.features.add("buildpkg") |
42 |
+ |
43 |
if "--quiet" in myopts or "--quiet-build" in myopts: |
44 |
settings["PORTAGE_QUIET"]="1" |
45 |
settings.backup_changes("PORTAGE_QUIET") |
46 |
|
47 |
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py |
48 |
index 84c4c58..343fd58 100644 |
49 |
--- a/pym/_emerge/main.py |
50 |
+++ b/pym/_emerge/main.py |
51 |
@@ -1545,6 +1545,11 @@ def emerge_main(args=None): |
52 |
settings, trees, mtimedb = load_emerge_config(trees=trees) |
53 |
portdb = trees[settings["ROOT"]]["porttree"].dbapi |
54 |
|
55 |
+ # NOTE: adjust_configs() can map options to FEATURES, so any relevant |
56 |
+ # options adjustments should be made prior to calling adjust_configs(). |
57 |
+ if "--buildpkgonly" in myopts: |
58 |
+ myopts["--buildpkg"] = True |
59 |
+ |
60 |
adjust_configs(myopts, trees) |
61 |
apply_priorities(settings) |
62 |
|
63 |
@@ -1587,9 +1592,6 @@ def emerge_main(args=None): |
64 |
if "--usepkgonly" in myopts: |
65 |
myopts["--usepkg"] = True |
66 |
|
67 |
- if "buildpkg" in settings.features or "--buildpkgonly" in myopts: |
68 |
- myopts["--buildpkg"] = True |
69 |
- |
70 |
if "--buildpkgonly" in myopts: |
71 |
# --buildpkgonly will not merge anything, so |
72 |
# it cancels all binary package options. |