aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-01-28 15:31:34 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-01-28 15:31:34 +0000
commit2bd227c4b7b5ec060db188c95b3afe08d2852918 (patch)
treee9370603f782fbdfaf94d3fb7a3e38ea2ab2c33d
parent8c430b5ceca4f852a8d244f7e07296120cf9ee99 (diff)
downloadpaludis-2bd227c4b7b5ec060db188c95b3afe08d2852918.tar.gz
paludis-2bd227c4b7b5ec060db188c95b3afe08d2852918.tar.xz
Don't load PALUDIS_PID from the saved environment. Make elog demo hook display messages if a clean fails.
-rwxr-xr-xebuild/ebuild.bash1
-rw-r--r--hooks/demos/elog.bash.in3
2 files changed, 3 insertions, 1 deletions
diff --git a/ebuild/ebuild.bash b/ebuild/ebuild.bash
index 40a5543..24dfe11 100755
--- a/ebuild/ebuild.bash
+++ b/ebuild/ebuild.bash
@@ -206,6 +206,7 @@ ebuild_load_ebuild()
-e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_EBUILD_DIR=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_COMMAND=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_HOME=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_PID=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?EBUILD_KILL_PID=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?ROOT=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?SANDBOX/d' \
diff --git a/hooks/demos/elog.bash.in b/hooks/demos/elog.bash.in
index 1743447..c02e44a 100644
--- a/hooks/demos/elog.bash.in
+++ b/hooks/demos/elog.bash.in
@@ -12,6 +12,7 @@
# @DATADIR@/paludis/hooks/uninstall_all_pre/
# @DATADIR@/paludis/hooks/uninstall_all_post/
# @DATADIR@/paludis/hooks/uninstall_fail/
+# @DATADIR@/paludis/hooks/clean_fail/
#
# And optionally:
#
@@ -47,7 +48,7 @@ case "${HOOK}" in
touch "${logfile}" || die "Couldn't create '${logfile}' for elog hooks"
;;
- install_all_post|uninstall_all_post|install_fail|uninstall_fail)
+ install_all_post|uninstall_all_post|install_fail|uninstall_fail|clean_fail)
echo
old_pf=""
while read line ; do