commit aa84e43a98640b6278cf76033c6e56853779563c
author Mike Frysinger <vapier@chromium.org> Tue Sep 24 14:06:27 2019 -0400
committer chrome-bot <chrome-bot@chromium.org> Fri Sep 27 07:39:48 2019 -0700
tree 1b70caa947c0704932736fe780b9520daaec89f6
parent 1f5004f49fb260ab04c5067f8acdec6193fa5b7d

build_packages: force python2 when running goma

The goma codebase is Python 2-only, so force it when running goma_ctl.

BUG=chromium:1007384
TEST=CQ passes

Change-Id: I9f649cb1fd628381c72f17589a61de5295b0419d
Reviewed-on: https://chromium-review.googlesource.com/1822677
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>

build_packages

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