From 3a3566b51f86c48c7a7e07a11da0805bd7fc3cfd Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Thu, 7 Jan 2010 07:36:32 +0000
Subject: [PATCH] Reduce noise in buildbot logs

Set LANG=C also when providing a command to enter_chroot.sh. Should make
buildbot logs quite a bit shorter.

Review URL: http://codereview.chromium.org/521053
---
 enter_chroot.sh | 2 +-
 make_chroot.sh  | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/enter_chroot.sh b/enter_chroot.sh
index 31734a9aed..a132cc2091 100755
--- a/enter_chroot.sh
+++ b/enter_chroot.sh
@@ -140,7 +140,7 @@ CHROOT_PASSTHRU="CHROMEOS_REVISION=$REVISION BUILDBOT_BUILD=$FLAGS_build_number
 # the source trunk for scripts that may need to print it (e.g.
 # build_image.sh).
 sudo chroot "$FLAGS_chroot" sudo -i -u $USER $CHROOT_PASSTHRU \
-  EXTERNAL_TRUNK_PATH="${FLAGS_trunk}" "$@"
+  EXTERNAL_TRUNK_PATH="${FLAGS_trunk}" LANG=C "$@"
 
 # Remove trap and explicitly unmount
 trap - EXIT
diff --git a/make_chroot.sh b/make_chroot.sh
index d1b0be15c0..e4004d0187 100755
--- a/make_chroot.sh
+++ b/make_chroot.sh
@@ -166,9 +166,6 @@ sudo mount --bind "$GCLIENT_ROOT" "${FLAGS_chroot}$CHROOT_TRUNK_DIR"
 
 # Niceties for interactive logins ('enter_chroot.sh'); these are ignored
 # when specifying a command to enter_chroot.sh.
-# Warn less when apt-get installing packqages
-echo "export LANG=C" >> "$FLAGS_chroot/home/$USER/.bashrc"
-chmod a+x "$FLAGS_chroot/home/$USER/.bashrc"
 # Automatically change to scripts directory
 echo "cd trunk/src/scripts" >> "$FLAGS_chroot/home/$USER/.profile"