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:08:54 -0800 |
| commit | 5ec72f096420a170d0f778116722661443cc2c15 (patch) | |
| tree | f6391031cdcac4b8c1f7a8caec7df4880d09694a /pym/portage/package/ebuild/doebuild.py | |
| parent | a1c89e016d692abd3faefadeac12423645ffcef8 (diff) | |
| download | portage-5ec72f096420a170d0f778116722661443cc2c15.tar.gz portage-5ec72f096420a170d0f778116722661443cc2c15.tar.bz2 portage-5ec72f096420a170d0f778116722661443cc2c15.zip | |
Sync EMERGE_FROM code with MERGE_TYPE code.
Diffstat (limited to 'pym/portage/package/ebuild/doebuild.py')
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index ba0a57836..5bba19ff8 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -642,8 +642,10 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, if eapi_exports_merge_type(mysettings["EAPI"]) and \ "MERGE_TYPE" not in mysettings.configdict["pkg"]: if tree == "porttree": + mysettings.configdict["pkg"]["EMERGE_FROM"] = "ebuild" mysettings.configdict["pkg"]["MERGE_TYPE"] = "source" elif tree == "bintree": + mysettings.configdict["pkg"]["EMERGE_FROM"] = "binary" mysettings.configdict["pkg"]["MERGE_TYPE"] = "binary" if eapi_exports_replace_vars(mysettings["EAPI"]) and \ |