commit df30825ec7e871cd958361a6cfbf39312c30088c
author Mike Frysinger <vapier@chromium.org> Thu Jun 15 21:54:53 2017 -0400
committer chrome-bot <chrome-bot@chromium.org> Mon Jun 19 15:33:14 2017 -0700
tree 6fdb6b9092f7b2d0284176da3ac18a79283bef25
parent 08ad2bcd4bb2277231738b3bdd7c346c30dc7287

update_chroot: switch EMERGE_FLAGS to an array

Just a style thing.  Shouldn't be functionally different.

BUG=chromium:725571
TEST=precq passes

Change-Id: Ia93904dee70fdb532cd93caf2090016dfa4d0899
Reviewed-on: https://chromium-review.googlesource.com/538358
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Yunlian Jiang <yunlian@chromium.org>

update_chroot

diff --git a/update_chroot b/update_chroot
index afbdacb..7bf4570 100755
--- a/update_chroot
+++ b/update_chroot
@@ -89,33 +89,35 @@
 CHROMITE_BIN="${GCLIENT_ROOT}/chromite/bin"
 EMERGE_CMD="${CHROMITE_BIN}/parallel_emerge"
 
-EMERGE_FLAGS="-uNv --with-bdeps=y --select"
+EMERGE_FLAGS=( -uNv --with-bdeps=y --select )
 if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
-  EMERGE_FLAGS="${EMERGE_FLAGS} --getbinpkg"
+  EMERGE_FLAGS+=( --getbinpkg )
 
   # Only update toolchain when binpkgs are available. Toolchain rollout
   # process only takes place when the chromiumos sdk builder finishes
   # a successful build.
-  EMERGE_FLAGS+=" --useoldpkg-atoms=dev-lang/go"
-  EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/binutils"
-  EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/clang"
-  EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/gcc"
-  EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/llvm"
-  EMERGE_FLAGS+=" --useoldpkg-atoms=sys-libs/glibc"
+  EMERGE_FLAGS+=(
+    --useoldpkg-atoms=dev-lang/go
+    --useoldpkg-atoms=sys-devel/binutils
+    --useoldpkg-atoms=sys-devel/clang
+    --useoldpkg-atoms=sys-devel/gcc
+    --useoldpkg-atoms=sys-devel/llvm
+    --useoldpkg-atoms=sys-libs/glibc
+  )
 fi
 
 if [[ "${FLAGS_jobs}" -ne -1 ]]; then
-  EMERGE_FLAGS+=" --jobs=${FLAGS_jobs}"
+  EMERGE_FLAGS+=( --jobs="${FLAGS_jobs}" )
 fi
 
 # Build cros_workon packages when they are changed.
 for pkg in $("${CHROMITE_BIN}/cros_list_modified_packages" --host); do
-  EMERGE_FLAGS+=" --reinstall-atoms=${pkg} --usepkg-exclude=${pkg}"
+  EMERGE_FLAGS+=( --reinstall-atoms="${pkg}" --usepkg-exclude="${pkg}" )
 done
 
 # Second pass, update everything else.
-EMERGE_FLAGS+=" --deep"
-sudo -E ${EMERGE_CMD} ${EMERGE_FLAGS} virtual/target-sdk world
+EMERGE_FLAGS+=( --deep )
+sudo -E ${EMERGE_CMD} "${EMERGE_FLAGS[@]}" virtual/target-sdk world
 
 # Automatically discard all CONFIG_PROTECT'ed files. Those that are
 # protected should not be overwritten until the variable is changed.