From e49d487245367fdb0bfc403fdfa775aa68db81e5 Mon Sep 17 00:00:00 2001
From: Ryan Cui <rcui@chromium.org>
Date: Wed, 19 Sep 2012 16:05:53 -0700
Subject: [PATCH] Ensure user has a chromium checkout before running
 chrome_set_ver.

Since the chrome sources have been removed from the default manifest,
leaving only a remnant inside chromium/src, we need to verify that they
actually have the chromium/src.git project checked out.

BUG=None
TEST=Local

Change-Id: I09f871034bb0d2664485a5ca6429204ebee67a19
Reviewed-on: https://gerrit.chromium.org/gerrit/33646
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Reviewed-by: Jon Kliegman <kliegs@chromium.org>
Commit-Ready: Ryan Cui <rcui@chromium.org>
Tested-by: Ryan Cui <rcui@chromium.org>
---
 cros_workon | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cros_workon b/cros_workon
index 8e60fc0e4e..cdd2e97b1b 100755
--- a/cros_workon
+++ b/cros_workon
@@ -296,8 +296,9 @@ chrome_to_live () {
   # Switch to using repo manifest checkout of chromium src.
   # Run chrome_set_ver to set DEPS
 
-  # No chromium directory checked out in this repo; probably a minilayout.
-  if [ ! -d "${CHROOT_TRUNK_DIR}/chromium" ]; then
+  # No chromium/src.git project checked out, meaning user not using
+  # gerrit_source.xml
+  if [ ! -d "${CHROOT_TRUNK_DIR}/chromium/src/.git" ]; then
     return
   fi