From 078ec6cf0dc24b925e3c8e8b3474f396b0373776 Mon Sep 17 00:00:00 2001
From: Michael Marineau <mike@marineau.org>
Date: Wed, 6 Nov 2013 18:18:46 -0800
Subject: [PATCH] fix(build_packages): Don't redirect emerge output.

The stats upload has been removed so there is no longer a need to
capture the emerge output to parse the logged output. Remove a bit of
dead chromeos logic too.
---
 build_packages | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/build_packages b/build_packages
index 21234f69b3..785b5306fd 100755
--- a/build_packages
+++ b/build_packages
@@ -199,11 +199,6 @@ if [ "${FLAGS_noworkon}" -eq "${FLAGS_FALSE}" ]; then
   CROS_WORKON_PKGS+=( $("${LIST_MODIFIED_PACKAGES}" --board=${FLAGS_board}) )
 fi
 
-# TODO(anush): Make chrome a fake cros-workon package.
-if [[ -n "${CHROME_ORIGIN}" ]]; then
-  CROS_WORKON_PKGS+=( chromeos-base/chromeos-chrome )
-fi
-
 if [[ ${#CROS_WORKON_PKGS[@]} -gt 0 ]]; then
   EMERGE_FLAGS+=(
     --reinstall-atoms="${CROS_WORKON_PKGS[*]}"
@@ -211,25 +206,12 @@ if [[ ${#CROS_WORKON_PKGS[@]} -gt 0 ]]; then
   )
 fi
 
-# Prepare tmp file to capture emerge output from tee.
-tmpfile=$(mktemp -t tmp.build_packages-emerge.XXXXXX)
-trap "rm -f '${tmpfile}'" EXIT
-
 info "Merging board packages now"
-(
-  set -o pipefail
-  sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" "${PACKAGES[@]}" | \
-    tee "${tmpfile}"
-)
+sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" "${PACKAGES[@]}"
 
 # upload packages if enabled
 upload_packages
 
-# Extract total package count from emerge output.
-package_count=$(awk '$0 ~ /^Total: [0-9]+ packages/ { print $2 }' "${tmpfile}")
-rm "${tmpfile}"
-trap - EXIT
-
 echo "Builds complete"
 command_completed
 echo "Done"