aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/eapis/pbin-1+4.conf
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-02-27 16:11:53 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-02-27 16:11:53 +0000
commit7224ee80cc55396c267b2517c01ffd9527e16700 (patch)
tree85085d72bfa42878c40291e388c6a8c8fed173c9 /paludis/repositories/e/eapis/pbin-1+4.conf
parent2c4c9b36faef13dd4ba408c80ca16461daee14bd (diff)
downloadpaludis-7224ee80cc55396c267b2517c01ffd9527e16700.tar.gz
paludis-7224ee80cc55396c267b2517c01ffd9527e16700.tar.xz
Make merge checks its own phase
Fixes: ticket:1085
Diffstat (limited to 'paludis/repositories/e/eapis/pbin-1+4.conf')
-rw-r--r--paludis/repositories/e/eapis/pbin-1+4.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/paludis/repositories/e/eapis/pbin-1+4.conf b/paludis/repositories/e/eapis/pbin-1+4.conf
index 396544345..210964c97 100644
--- a/paludis/repositories/e/eapis/pbin-1+4.conf
+++ b/paludis/repositories/e/eapis/pbin-1+4.conf
@@ -35,6 +35,7 @@ ebuild_install = \
skipname=installbin sandbox clearenv : loadenv installbin saveenv ; \
skipname=strip strip : ; \
skipname=preinst clearenv prepost : loadenv preinst saveenv ; \
+ skipname=check_merge check_merge : ; \
skipname=merge merge : ; \
skipname=postinst clearenv prepost : loadenv postinst saveenv ; \
skipname=tidyup tidyup clearenv : loadenv tidyup