aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-05-18 10:42:51 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-05-18 10:42:51 +0000
commit4e642e700521aa4ab73012f4c0f1a84d7f5a0bc5 (patch)
tree42e4265e5e0e06f5e364714e8c13a44af91033e9
parentd9e139d5563d97e4247ed59d16a4dca4cf282053 (diff)
downloadpaludis-4e642e700521aa4ab73012f4c0f1a84d7f5a0bc5.tar.gz
paludis-4e642e700521aa4ab73012f4c0f1a84d7f5a0bc5.tar.xz
Don't elog in pretend, config and metadata phases.
-rw-r--r--hooks/demos/elog.bash.in4
-rwxr-xr-xpaludis/repositories/gentoo/ebuild/ebuild.bash1
2 files changed, 5 insertions, 0 deletions
diff --git a/hooks/demos/elog.bash.in b/hooks/demos/elog.bash.in
index 2b0cb06..ba4361b 100644
--- a/hooks/demos/elog.bash.in
+++ b/hooks/demos/elog.bash.in
@@ -22,6 +22,10 @@
#
# You should ensure that it has execute permissions.
+case "${EBUILD_PHASE}" in
+ config|pretend|metadata) return
+esac
+
source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
logfile="${PALUDIS_HOOKS_TMPDIR:-${ROOT}/var/tmp/paludis}/elog.${PALUDIS_PID}"
diff --git a/paludis/repositories/gentoo/ebuild/ebuild.bash b/paludis/repositories/gentoo/ebuild/ebuild.bash
index fb23b6c..ac7d99e 100755
--- a/paludis/repositories/gentoo/ebuild/ebuild.bash
+++ b/paludis/repositories/gentoo/ebuild/ebuild.bash
@@ -339,6 +339,7 @@ ebuild_main()
done
if [[ $1 == metadata ]] || [[ $1 == variable ]] ; then
+ export EBUILD_PHASE="${1}"
perform_hook ebuild_${action}_pre
if [[ $1 != variable ]] || [[ -n "${ebuild}" ]] ; then
for f in cut tr date ; do