aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/ebuild
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2015-03-01 15:22:32 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2015-03-01 15:22:32 +0000
commit96768e54e2fdfc526edd2e939f20203e43b25a36 (patch)
tree67ef14735f46b396eb65a3f7c76554e073953214 /paludis/repositories/e/ebuild
parent40ba4f033c892e0fc8ea779c697a86e9bf61cefd (diff)
downloadpaludis-96768e54e2fdfc526edd2e939f20203e43b25a36.tar.gz
paludis-96768e54e2fdfc526edd2e939f20203e43b25a36.tar.xz
Fix MERGE_TYPE
Unfortunately the test cases were broken in the same way as the feature itself, so it wasn't caught. Fixes: ticket:1323
Diffstat (limited to 'paludis/repositories/e/ebuild')
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index a88554b1c..f4387e1e7 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -304,7 +304,7 @@ ebuild_scrub_environment()
echo "\${!${PALUDIS_CLIENT_UPPER}_CMDLINE_*} ${PALUDIS_CLIENT_UPPER}_OPTIONS" )
unset -v CATEGORY PN PV P PNV PVR PF PNVR
- unset -v ebuild EBUILD
+ unset -v ebuild EBUILD MERGE_TYPE
unset -v $(
for v in ${PALUDIS_SOURCE_MERGED_VARIABLES} ${PALUDIS_BRACKET_MERGED_VARIABLES} ; do
echo E_${v}