commit ea21dea26a2f4e28232570c3de96ca8c4fe76032
author Mike Frysinger <vapier@chromium.org> Thu Feb 20 01:15:24 2020 -0500
committer Mike Frysinger <vapier@chromium.org> Fri Feb 21 08:03:55 2020 +0000
tree c1a2c17a6b967af4a09371473920ef9516e0a895
parent 7c764adc92a5aa3c300fda3786d370f130475c47

build_packages: drop python2 forcing w/goma

It should work with Python 3 now.

BUG=chromium:1007384
TEST=CQ passes

Change-Id: I25585be8ef49c957b1c844875557eb30825dd6fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/2065314
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Tested-by: Mike Frysinger <vapier@chromium.org>

build_packages

diff --git a/build_packages b/build_packages
index eb8c876..149b3a3 100755
--- a/build_packages
+++ b/build_packages
@@ -372,9 +372,8 @@
   if [[ "${FLAGS_run_goma}" -eq "${FLAGS_TRUE}" ]]; then
     info "Starting goma compiler_proxy."
     goma_ctl="${GOMA_DIR:-${HOME}/goma}/goma_ctl.py"
-    # TODO(crbug.com/1007384): Stop forcing Python 2.
-    EPYTHON="python2" "${goma_ctl}" restart
-    trap "EPYTHON=python2 '${goma_ctl}' stop" EXIT
+    "${goma_ctl}" restart
+    trap "'${goma_ctl}' stop" EXIT
   fi
 
   sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" "${PACKAGES[@]}"