aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2016-01-12 16:43:22 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2016-01-12 16:43:22 +0000
commit1684b446715907515359cd310c1e7bd93bad5a2e (patch)
tree6b0e8e00e50e7967bff04bf882ee3528c4def5fc
parent6892a7edbc42236253136a72026528fb9cba1c47 (diff)
downloadpaludis-1684b446715907515359cd310c1e7bd93bad5a2e.tar.gz
paludis-1684b446715907515359cd310c1e7bd93bad5a2e.tar.xz
Clear out MERGE_TYPE for non-installs
-rw-r--r--paludis/repositories/e/ebuild.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index a45c5d1..8a26aee 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -296,6 +296,9 @@ EbuildCommand::operator() ()
.setenv("PALUDIS_PROFILES_DIRS", "")
.setenv("ROOT", params.root());
+ if (! params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_merge_type().empty())
+ process.setenv(params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_merge_type(), "");
+
extend_command(process);
if (! params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_kv().empty())