aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-17 13:11:23 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-17 13:11:37 +0000
commit9c201c57ddf18e627fd1712efbf23c6fe11a6846 (patch)
tree9093f532e28729108fc2d9dce82f31310a3324a6
parent9498752c4f8922bc4031e3a2febe883cf543de79 (diff)
downloadpaludis-9c201c57ddf18e627fd1712efbf23c6fe11a6846.tar.gz
paludis-9c201c57ddf18e627fd1712efbf23c6fe11a6846.tar.xz
Fix upgrade path. Really this time. Maybe.
-rw-r--r--paludis/repositories/e/ebuild.cc1
-rwxr-xr-xpaludis/repositories/e/ebuild/pipe_functions.bash2
2 files changed, 2 insertions, 1 deletions
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 0809fa4..28ae2a9 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -211,6 +211,7 @@ EbuildCommand::operator() ()
.with_setenv("PALUDIS_NAME_VERSION_REVISION_VAR",
params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_pf())
.with_setenv("PALUDIS_PIPE_COMMANDS_SUPPORTED", "yes")
+ .with_setenv("PALUDIS_PIPE_COMMAND_DELIM", "\2")
)
.with_setenv("SLOT", "")
.with_setenv("PALUDIS_PROFILE_DIR", "")
diff --git a/paludis/repositories/e/ebuild/pipe_functions.bash b/paludis/repositories/e/ebuild/pipe_functions.bash
index a8a1585..442c2a8 100755
--- a/paludis/repositories/e/ebuild/pipe_functions.bash
+++ b/paludis/repositories/e/ebuild/pipe_functions.bash
@@ -44,7 +44,7 @@ paludis_pipe_command()
fi
local r r1 rest a
- r="$(for a in "$@" ; do echo -n "$a"$'\2' ; done | {
+ r="$(for a in "$@" ; do echo -n "${a}${PALUDIS_PIPE_COMMAND_DELIM:- }" ; done | {
if ! locked_pipe_command "${PALUDIS_PIPE_COMMAND_WRITE_FD}" "${PALUDIS_PIPE_COMMAND_READ_FD}" ; then
type die &>/dev/null && eval die "\"locked_pipe_command failed\""
echo "locked_pipe_command failed" 1>&2