From 9562620a5960459577fbb005dd64f3a7d7c35f8a Mon Sep 17 00:00:00 2001
From: Zdenek Behan <zbehan@chromium.org>
Date: Thu, 12 May 2011 05:54:19 +0200
Subject: [PATCH] update_chroot: sort out emerge arguments into just one
 variable

BUG=none
TEST=update_chroot, verify all options are passed in correctly

Change-Id: Ic64ae6cce1b21bb70c04341a5607f6327cc43cb1
Reviewed-on: http://gerrit.chromium.org/gerrit/745
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Zdenek Behan <zbehan@chromium.org>
---
 update_chroot | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/update_chroot b/update_chroot
index 346570c992..a16de44b36 100755
--- a/update_chroot
+++ b/update_chroot
@@ -32,15 +32,16 @@ set -e
 info "Updating chroot"
 
 EMERGE_FLAGS="-uDNv --with-bdeps=y"
+if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
+  EMERGE_FLAGS="${EMERGE_FLAGS} --getbinpkg"
+fi
 
 # Perform an update of hard-host-depends and world in the chroot.
 EMERGE_CMD="emerge"
 if [ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]; then
   EMERGE_CMD="${GCLIENT_ROOT}/chromite/bin/parallel_emerge"
 fi
-if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
-  EMERGE_CMD="${EMERGE_CMD} -g"
-fi
+
 eretry sudo -E ${EMERGE_CMD} ${EMERGE_FLAGS} \
     chromeos-base/hard-host-depends world