aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-27 17:06:00 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-27 17:06:00 +0100
commit3ace323255a056bca23028af8fad91fcc1640a49 (patch)
treea8eedd2b78fd48699ebf799b117c2fe1821eb960
parent39ca74aecd40eec1a5a61d588c251957f45e8d58 (diff)
downloadpaludis-3ace323255a056bca23028af8fad91fcc1640a49.tar.gz
paludis-3ace323255a056bca23028af8fad91fcc1640a49.tar.xz
Make the upgrade path work
-rw-r--r--paludis/repositories/e/ebuild.cc5
-rw-r--r--paludis/repositories/e/ebuild/0/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/1/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/2/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/3/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/4/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/paludis-1/output_functions.bash3
9 files changed, 21 insertions, 8 deletions
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 9f4f178..0611a55 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -258,6 +258,7 @@ EbuildCommand::operator() ()
.setenv("PALUDIS_EBUILD_PHASE_VAR",
params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_ebuild_phase())
.setenv("PALUDIS_PIPE_COMMANDS_SUPPORTED", "yes")
+ .setenv("PALUDIS_PIPE_COMMANDS_STATUS_SUPPORTED", "yes")
.setenv("PALUDIS_PIPE_COMMAND_DELIM", "\2")
.setenv("PALUDIS_SHELL_OPTIONS",
params.package_id()->eapi()->supported()->ebuild_options()->shell_options())
@@ -1010,6 +1011,8 @@ WriteVDBEntryCommand::operator() ()
params.package_id()->eapi()->supported()->ebuild_options()->ebuild_module_suffixes())
.setenv("PALUDIS_EBUILD_PHASE_VAR",
params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_ebuild_phase())
+ .setenv("PALUDIS_PIPE_COMMANDS_SUPPORTED", "yes")
+ .setenv("PALUDIS_PIPE_COMMANDS_STATUS_SUPPORTED", "yes")
.pipe_command_handler("PALUDIS_PIPE_COMMAND", std::bind(&pipe_command_handler, params.environment(),
params.package_id(), _1, params.maybe_output_manager()));
@@ -1233,6 +1236,8 @@ WriteBinaryEbuildCommand::operator() ()
params.package_id()->eapi()->supported()->ebuild_options()->ebuild_module_suffixes())
.setenv("PALUDIS_EBUILD_PHASE_VAR",
params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_ebuild_phase())
+ .setenv("PALUDIS_PIPE_COMMANDS_SUPPORTED", "yes")
+ .setenv("PALUDIS_PIPE_COMMANDS_STATUS_SUPPORTED", "yes")
.pipe_command_handler("PALUDIS_PIPE_COMMAND", std::bind(&pipe_command_handler, params.environment(),
params.package_id(), _1, params.maybe_output_manager()));
diff --git a/paludis/repositories/e/ebuild/0/output_functions.bash b/paludis/repositories/e/ebuild/0/output_functions.bash
index 17aab0e..8fe8817 100644
--- a/paludis/repositories/e/ebuild/0/output_functions.bash
+++ b/paludis/repositories/e/ebuild/0/output_functions.bash
@@ -25,7 +25,8 @@ ebuild_notice()
ebuild_section()
{
echo -ne "${COLOUR_GREEN}>>>${COLOUR_NORMAL} "
- paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_GREEN}>>>${COLOUR_NORMAL} $@" >/dev/null
+ [[ ${PALUDIS_PIPE_COMMANDS_STATUS_SUPPORTED} == "yes" ]] && \
+ paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_GREEN}>>>${COLOUR_NORMAL} $@" >/dev/null
echo "$@"
}
diff --git a/paludis/repositories/e/ebuild/1/output_functions.bash b/paludis/repositories/e/ebuild/1/output_functions.bash
index d6e3cbc..701e6d6 100644
--- a/paludis/repositories/e/ebuild/1/output_functions.bash
+++ b/paludis/repositories/e/ebuild/1/output_functions.bash
@@ -25,7 +25,8 @@ ebuild_notice()
ebuild_section()
{
echo -ne "${COLOUR_BLUE}>>>${COLOUR_NORMAL} "
- paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_BLUE}>>>${COLOUR_NORMAL} $@" >/dev/null
+ [[ ${PALUDIS_PIPE_COMMANDS_STATUS_SUPPORTED} == "yes" ]] && \
+ paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_BLUE}>>>${COLOUR_NORMAL} $@" >/dev/null
echo "$@"
}
diff --git a/paludis/repositories/e/ebuild/2/output_functions.bash b/paludis/repositories/e/ebuild/2/output_functions.bash
index fc23b7a..29fde57 100644
--- a/paludis/repositories/e/ebuild/2/output_functions.bash
+++ b/paludis/repositories/e/ebuild/2/output_functions.bash
@@ -25,7 +25,8 @@ ebuild_notice()
ebuild_section()
{
echo -ne "${COLOUR_BROWN}>>>${COLOUR_NORMAL} "
- paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_BROWN}>>>${COLOUR_NORMAL} $@" >/dev/null
+ [[ ${PALUDIS_PIPE_COMMANDS_STATUS_SUPPORTED} == "yes" ]] && \
+ paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_BROWN}>>>${COLOUR_NORMAL} $@" >/dev/null
echo "$@"
}
diff --git a/paludis/repositories/e/ebuild/3/output_functions.bash b/paludis/repositories/e/ebuild/3/output_functions.bash
index 550c3ec..af13af1 100644
--- a/paludis/repositories/e/ebuild/3/output_functions.bash
+++ b/paludis/repositories/e/ebuild/3/output_functions.bash
@@ -25,7 +25,8 @@ ebuild_notice()
ebuild_section()
{
echo -ne "${COLOUR_DARK_BLUE}>>>${COLOUR_NORMAL} "
- paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_DARK_BLUE}>>>${COLOUR_NORMAL} $@" >/dev/null
+ [[ ${PALUDIS_PIPE_COMMANDS_STATUS_SUPPORTED} == "yes" ]] && \
+ paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_DARK_BLUE}>>>${COLOUR_NORMAL} $@" >/dev/null
echo "$@"
}
diff --git a/paludis/repositories/e/ebuild/4/output_functions.bash b/paludis/repositories/e/ebuild/4/output_functions.bash
index aa61bc8..ea8ded8 100644
--- a/paludis/repositories/e/ebuild/4/output_functions.bash
+++ b/paludis/repositories/e/ebuild/4/output_functions.bash
@@ -25,7 +25,8 @@ ebuild_notice()
ebuild_section()
{
echo -ne "${COLOUR_PURPLE}>>>${COLOUR_NORMAL} "
- paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_PURPLE}>>>${COLOUR_NORMAL} $@" >/dev/null
+ [[ ${PALUDIS_PIPE_COMMANDS_STATUS_SUPPORTED} == "yes" ]] && \
+ paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_PURPLE}>>>${COLOUR_NORMAL} $@" >/dev/null
echo "$@"
}
diff --git a/paludis/repositories/e/ebuild/exheres-0/output_functions.bash b/paludis/repositories/e/ebuild/exheres-0/output_functions.bash
index 4c4a247..1c466d8 100644
--- a/paludis/repositories/e/ebuild/exheres-0/output_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/output_functions.bash
@@ -25,6 +25,7 @@ ebuild_notice()
ebuild_section()
{
echo -ne "${COLOUR_PINK}===${COLOUR_NORMAL} "
- paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_PINK}===${COLOUR_NORMAL} $@" >/dev/null
+ [[ ${PALUDIS_PIPE_COMMANDS_STATUS_SUPPORTED} == "yes" ]] && \
+ paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_PINK}===${COLOUR_NORMAL} $@" >/dev/null
echo "$@"
}
diff --git a/paludis/repositories/e/ebuild/output_functions.bash b/paludis/repositories/e/ebuild/output_functions.bash
index 17aab0e..8fe8817 100644
--- a/paludis/repositories/e/ebuild/output_functions.bash
+++ b/paludis/repositories/e/ebuild/output_functions.bash
@@ -25,7 +25,8 @@ ebuild_notice()
ebuild_section()
{
echo -ne "${COLOUR_GREEN}>>>${COLOUR_NORMAL} "
- paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_GREEN}>>>${COLOUR_NORMAL} $@" >/dev/null
+ [[ ${PALUDIS_PIPE_COMMANDS_STATUS_SUPPORTED} == "yes" ]] && \
+ paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_GREEN}>>>${COLOUR_NORMAL} $@" >/dev/null
echo "$@"
}
diff --git a/paludis/repositories/e/ebuild/paludis-1/output_functions.bash b/paludis/repositories/e/ebuild/paludis-1/output_functions.bash
index 3b8acee..968598f 100644
--- a/paludis/repositories/e/ebuild/paludis-1/output_functions.bash
+++ b/paludis/repositories/e/ebuild/paludis-1/output_functions.bash
@@ -25,7 +25,8 @@ ebuild_notice()
ebuild_section()
{
echo -ne "${COLOUR_YELLOW}===${COLOUR_NORMAL} "
- paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_YELLOW}===${COLOUR_NORMAL} $@" >/dev/null
+ [[ ${PALUDIS_PIPE_COMMANDS_STATUS_SUPPORTED} == "yes" ]] && \
+ paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_YELLOW}===${COLOUR_NORMAL} $@" >/dev/null
echo "$@"
}