From be24c739e9ec2ad544356a7b96fd94917321d05c Mon Sep 17 00:00:00 2001 From: Ryan Cui Date: Wed, 22 Aug 2012 15:15:00 -0700 Subject: [PATCH] Remove running of gerrit source transition chroot-upgrade hook. The code has been in here long enough - most people should be transitioned over who are using gerrit-source. We've also already removed the chrome projects from the default manifest, and things look good so far. BUG=chromium-os:32963 TEST=remote trybot Change-Id: Idd5e3a2ad77ea86c7316a9d50f5da1a5fdf01d8b Reviewed-on: https://gerrit.chromium.org/gerrit/31161 Reviewed-by: Brian Harring Commit-Ready: Ryan Cui Tested-by: Ryan Cui --- sdk_lib/enter_chroot.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sdk_lib/enter_chroot.sh b/sdk_lib/enter_chroot.sh index ca2725f13b..0b25cdb64c 100755 --- a/sdk_lib/enter_chroot.sh +++ b/sdk_lib/enter_chroot.sh @@ -611,16 +611,6 @@ else cmd=( sudo -i -u "$USER" ) fi -# TODO(rcui): Remove this hook on 8/26/2012. -# crosbug.com/32963 -if [ $FLAGS_early_make_chroot -eq $FLAGS_FALSE ]; then - chroot_script_root="\${HOME}/trunk/src/scripts" - hook_rel_path="chroot_version_hooks.d/44_fix_gerrit_chrome" - gerrit_chrome_hook="${chroot_script_root}/${hook_rel_path}" - sudo -- chroot "${FLAGS_chroot}" "${cmd[@]}" "${CHROOT_PASSTHRU[@]}" \ - bash -c "source \"${gerrit_chrome_hook}\"" -fi - sudo -- chroot "${FLAGS_chroot}" "${cmd[@]}" "${CHROOT_PASSTHRU[@]}" "$@" # Remove trap and explicitly unmount