diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-12-05 03:08:54 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-12-05 03:09:50 -0800 |
| commit | 1d5d1fb05c85ed4386f041bcbd7d8fbe6f7e6e13 (patch) | |
| tree | 65febdf45513bcfd0e0a11b274f840e191a718ca /pym/_emerge | |
| parent | e7f0965e86c93146b1726087c76ea14593b2fd20 (diff) | |
| download | portage-1d5d1fb05c85ed4386f041bcbd7d8fbe6f7e6e13.tar.gz portage-1d5d1fb05c85ed4386f041bcbd7d8fbe6f7e6e13.tar.bz2 portage-1d5d1fb05c85ed4386f041bcbd7d8fbe6f7e6e13.zip | |
Sync EMERGE_FROM code with MERGE_TYPE code.
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/Binpkg.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/EbuildBuild.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/Scheduler.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index 9279fa39a..8b93a2dfb 100644 --- a/pym/_emerge/Binpkg.py +++ b/pym/_emerge/Binpkg.py @@ -54,7 +54,7 @@ class Binpkg(CompositeTask): (dir_path, self.settings['PORTAGE_BUILDDIR'])) self._build_dir = EbuildBuildDir( scheduler=self.scheduler, settings=settings) - settings.configdict["pkg"]["EMERGE_FROM"] = pkg.type_name + settings.configdict["pkg"]["EMERGE_FROM"] = "binary" settings.configdict["pkg"]["MERGE_TYPE"] = "binary" # The prefetcher has already completed or it diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py index d241bc74b..135f5c95e 100644 --- a/pym/_emerge/EbuildBuild.py +++ b/pym/_emerge/EbuildBuild.py @@ -41,7 +41,7 @@ class EbuildBuild(CompositeTask): self._tree = tree portdb = root_config.trees[tree].dbapi settings.setcpv(pkg) - settings.configdict["pkg"]["EMERGE_FROM"] = pkg.type_name + settings.configdict["pkg"]["EMERGE_FROM"] = "ebuild" if self.opts.buildpkgonly: settings.configdict["pkg"]["MERGE_TYPE"] = "buildonly" else: diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 183a922f9..87dcfcb14 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -1025,6 +1025,7 @@ class Scheduler(PollScheduler): os.makedirs(infloc) portage.xpak.tbz2(tbz2_file).unpackinfo(infloc) ebuild_path = os.path.join(infloc, x.pf + ".ebuild") + settings.configdict["pkg"]["EMERGE_FROM"] = "binary" settings.configdict["pkg"]["MERGE_TYPE"] = "binary" else: @@ -1033,6 +1034,7 @@ class Scheduler(PollScheduler): ebuild_path = portdb.findname(x.cpv) if ebuild_path is None: raise AssertionError("ebuild not found for '%s'" % x.cpv) + settings.configdict["pkg"]["EMERGE_FROM"] = "ebuild" if self._build_opts.buildpkgonly: settings.configdict["pkg"]["MERGE_TYPE"] = "buildonly" else: |