commit 871a40aa8f627d7ed34206f22313f32a647eff24
author Brian Harring <ferringb@google.com> Mon Jan 14 01:00:31 2013 -0800
committer Brian Harring <ferringb@chromium.org> Mon Jan 14 01:18:33 2013 -0800
tree 18b266f581c4a99d0d42dc286a0e94c2910e14be
parent 2499bfbeb2d44ab204aba752d4e42e12861831e3

Fix bug introduced via CL:37347

Slipped past during rename of the chroot upgrade script from
49 to 50; name was slightly changed but full re-validation of the
rename wasn't done (thus the typo slipped past testing, and review).

Simplify the code via removal of invoking the upgrade script, instead
just doing the relevant commands (fixing chroot awareness issues in
the process).

BUG=None
TEST=manual cros_sdk invocation

Change-Id: I122de8b4cf7ec0845643e09e7919cbcdbd0bb79a
Reviewed-on: https://gerrit.chromium.org/gerrit/41202
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Brian Harring <ferringb@chromium.org>

sdk_lib/make_chroot.sh

diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index 265e4dd..63c4c79 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -242,8 +242,10 @@
 EOF
 
    # Add chromite into python path.
-   CHROOT_TRUNK_DIR="${CHROOT_TRUNK_DIR}" bash -e \
-       "${SCRIPT_ROOT}/chroot_version_hooks.d/50_add_chromite_pythonpath"
+   for python_path in "${FLAGS_chroot}/usr/lib/"python2.*; do
+     sudo mkdir -p "${python_path}"
+     sudo ln -s "${CHROOT_TRUNK_DIR}"/chromite "${python_path}"
+   done
 
    # TODO(zbehan): Configure stuff that is usually configured in postinst's,
    # but wasn't. Fix the postinst's.