aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-01-01 19:41:25 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-01-01 19:41:25 +0000
commitef15a04326d1cb640b107c047552d69e77b29c82 (patch)
tree942e31ad5701446482043640c3fba44931915a62
parentb59d7c6e1bd11ec83acfb43e24c02b125312a38f (diff)
downloadpaludis-ef15a04326d1cb640b107c047552d69e77b29c82.tar.gz
paludis-ef15a04326d1cb640b107c047552d69e77b29c82.tar.xz
Fix upgrading from alpha4.
-rw-r--r--paludis/repositories/e/ebuild.cc1
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash10
-rw-r--r--paludis/repositories/e/ebuild/echo_functions.bash.in1
3 files changed, 10 insertions, 2 deletions
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 5e83649..74bc6ca 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -163,6 +163,7 @@ EbuildCommand::operator() ()
params.package_id->eapi()->supported->ebuild_options->must_not_change_variables)
.with_setenv("PALUDIS_RDEPEND_DEFAULTS_TO_DEPEND",
params.package_id->eapi()->supported->ebuild_options->rdepend_defaults_to_depend ? "yes" : "")
+ .with_setenv("PALUDIS_PIPE_COMMANDS_SUPPORTED", "yes")
)
.with_setenv("SLOT", "")
.with_setenv("PALUDIS_PROFILE_DIR", "")
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index 555e56f..a91ff0f 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -140,10 +140,16 @@ ebuild_load_module eclass_functions
ebuild_load_module exlib_functions
ebuild_load_module source_functions
-if [[ -z "${PALUDIS_SKIP_PIPE_COMMAND_CHECK}" ]] ; then
+check_paludis_pipe_command()
+{
+ [[ -n "${PALUDIS_SKIP_PIPE_COMMAND_CHECK}" ]] && return
+ [[ -z "${PALUDIS_PIPE_COMMANDS_SUPPORTED}" ]] && return
+
pcr=$(paludis_pipe_command PING DUNNOYET $$ )
[[ "$pcr" == "PONG $$" ]] || die "paludis_pipe_command isn't working (got '$pcr')"
-fi
+}
+
+check_paludis_pipe_command
export PALUDIS_HOME="$(canonicalise ${PALUDIS_HOME:-${HOME}} )"
diff --git a/paludis/repositories/e/ebuild/echo_functions.bash.in b/paludis/repositories/e/ebuild/echo_functions.bash.in
index 1b2ef24..39affa5 100644
--- a/paludis/repositories/e/ebuild/echo_functions.bash.in
+++ b/paludis/repositories/e/ebuild/echo_functions.bash.in
@@ -191,6 +191,7 @@ use_enable()
ebuild_notice()
{
+ [[ -z "${PALUDIS_PIPE_COMMANDS_SUPPORTED}" ]] && return
paludis_pipe_command LOG "$EAPI" "$@" >/dev/null
}