make_chroot: drop python-3 unmerge logic
We've started shipping python-3 in the sdk, so don't unmerge it anymore.
We'll just waste time on developer's systems re-emerging it.
BUG=chromium:422771
TEST=`cros_sdk --chroot foo` doesn't remove/install python-3
Change-Id: Ie15228cfcf33987df4c909c48830eb591237eb55
Reviewed-on: https://chromium-review.googlesource.com/223164
Reviewed-by: Yu-Ju Hong <yjhong@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index d86ba25..de9d53c 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -440,10 +440,10 @@
info "Updating python-2.x"
early_enter_chroot emerge -uNvq =dev-lang/python-2*
-# New versions of the stage3 have Python 3 set as the default. Get rid of it,
-# as our scripts are only compatible with Python 2.
+# New versions of the stage3 have Python 3 set as the default. Make sure we
+# default to 2.x as our scripts are only compatible with Python 2. We leave
+# Python 3 installed though as we've started including it in our SDK.
early_enter_chroot eselect python set 1
-early_enter_chroot env CLEAN_DELAY=0 emerge -qC =dev-lang/python-3* || true
# Add chromite into python path.
# This needs to happen after the python update or the correct /usr/lib/python2.*