Update chroot for chromite if needed.

enter_chroot.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to enter the chroot environment
 
 # --- BEGIN COMMON.SH BOILERPLATE ---
 # Load common CrOS utilities.  Inside the chroot this file is installed in
@@ skipping 284 matching lines @@
       # sort the list of mounts in reverse order, to ensure umount of
       # cascading mounts in proper order
       for i in \
         $(mount | grep -F "on $MOUNTED_PATH/" | sort -r | awk '{print $3}'); do
         safe_umount "$i"
       done
     fi
   ) 200>>"$LOCKFILE" || die "teardown_env failed"
 }
 
+# This function does extra "fixups" of the chroot.  It's a lot like
+# chroot_hacks_from_outside() in common.sh, except that it is only called
+# from enter_chroot.sh (chroot_hacks_from_outside is also called from
+# make_chroot.sh).  This function was created because common.sh is on lockdown
+# and can't be changed.
+#
+# NOTE: the need for this type of "fixup" should be going away.  If everything
+# in the chroot is versioned and nothing is generated, there is no need to
+# handle partly fixing up generated files.
+#
+# Please put date information so it's easy to keep track of when
+# old hacks can be retired and so that people can detect when a
+# hack triggered when it shouldn't have.
+function chroot_hacks_too() {
+  local chroot_home="${FLAGS_chroot}/home/${USER}"
+
+  # Add chromite stuff if not already done.
+  if ! grep -q "^PATH=.*/trunk/chromite/bin" "${chroot_home}/.bashrc"; then
+    info "Upgrading old chroot (pre 2011-02-09) - adding chromite to path"
+    echo "PATH=\$PATH:/home/${USER}/trunk/chromite/bin" >> \
+      "${chroot_home}/.bashrc"
+  fi
+  if ! [ -L "${chroot_home}/.local/lib/python2.6/site-packages/chromite" ]; then
+    info "Upgrading old chroot (pre 2011-02-09) - add chromite to site-packages"
+    mkdir -p "${chroot_home}/.local/lib/python2.6/site-packages"
+    ln -s ../../../../trunk/chromite \
+      "${chroot_home}/.local/lib/python2.6/site-packages/"
+  fi
+}
+
+
 if [ $FLAGS_mount -eq $FLAGS_TRUE ]; then
   setup_env
   info "Make sure you run"
   info "    $0 --unmount"
   info "before deleting $FLAGS_chroot"
   info "or you'll end up deleting $FLAGS_trunk too!"
   exit 0
 fi
 
 if [ $FLAGS_unmount -eq $FLAGS_TRUE ]; then
   teardown_env
   exit 0
 fi
 
 # Apply any hacks needed to update the chroot.
 chroot_hacks_from_outside "${FLAGS_chroot}"
+chroot_hacks_too
 
 
 # Make sure we unmount before exiting
 trap teardown_env EXIT
 setup_env
 
 # Get the git revision to pass into the chroot.
 #
 # This must be determined outside the chroot because (1) there is no
 # git inside the chroot, and (2) if there were it would likely be
@@ skipping 37 matching lines @@
 # Run command or interactive shell.  Also include the non-chrooted path to
 # 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}" LANG=C SSH_AGENT_PID="${SSH_AGENT_PID}" \
   SSH_AUTH_SOCK="${SSH_AUTH_SOCK}" "$@"
 
 # Remove trap and explicitly unmount
 trap - EXIT
 teardown_env