diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-12-03 19:55:18 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-12-03 22:32:42 -0800 |
| commit | 39bb54aee7123a2087657c296d10a80c78beebfc (patch) | |
| tree | 5e4f47d4a86c562015d627499b8a7e63987cda5e /pym/_emerge | |
| parent | d5ab3d0413bb401245738ae27a4bd4658b6527db (diff) | |
| download | portage-39bb54aee7123a2087657c296d10a80c78beebfc.tar.gz portage-39bb54aee7123a2087657c296d10a80c78beebfc.tar.bz2 portage-39bb54aee7123a2087657c296d10a80c78beebfc.zip | |
EAPI 4: Support MERGE_TYPE (bug #347351)
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/Binpkg.py | 1 | ||||
| -rw-r--r-- | pym/_emerge/EbuildBuild.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index 89f136106..9279fa39a 100644 --- a/pym/_emerge/Binpkg.py +++ b/pym/_emerge/Binpkg.py @@ -55,6 +55,7 @@ class Binpkg(CompositeTask): self._build_dir = EbuildBuildDir( scheduler=self.scheduler, settings=settings) settings.configdict["pkg"]["EMERGE_FROM"] = pkg.type_name + settings.configdict["pkg"]["MERGE_TYPE"] = "binary" # The prefetcher has already completed or it # could be running now. If it's running now, diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py index 974a1586a..d241bc74b 100644 --- a/pym/_emerge/EbuildBuild.py +++ b/pym/_emerge/EbuildBuild.py @@ -42,6 +42,10 @@ class EbuildBuild(CompositeTask): portdb = root_config.trees[tree].dbapi settings.setcpv(pkg) settings.configdict["pkg"]["EMERGE_FROM"] = pkg.type_name + if self.opts.buildpkgonly: + settings.configdict["pkg"]["MERGE_TYPE"] = "buildonly" + else: + settings.configdict["pkg"]["MERGE_TYPE"] = "source" ebuild_path = portdb.findname(pkg.cpv) if ebuild_path is None: raise AssertionError("ebuild not found for '%s'" % pkg.cpv) |