Make the upgrade path work

9 files changed, 21 insertions, 8 deletions

diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 9f4f178ed..0611a558a 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 17aab0e7f..8fe8817d0 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 d6e3cbcd7..701e6d612 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 fc23b7ad3..29fde5749 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 550c3ec19..af13af184 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 aa61bc816..ea8ded85a 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 4c4a2475b..1c466d865 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 17aab0e7f..8fe8817d0 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 3b8acee07..968598f1e 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 "$@"
 }