commit e09d3c2fd58f62b153520e6108f7d2c172b1a34d
author Ryan Cui <rcui@chromium.org> Tue Jul 31 11:55:58 2012 -0700
committer Gerrit <chrome-bot@google.com> Tue Jul 31 16:07:36 2012 -0700
tree a156d3a125746bc02c72c6831a85436b7c0a86ac
parent 308813b5fe315582fd396dd1d9e1270e640bebfa

Upgrade hook v44 fixes

- do test for chromium/src before fixing the checkout.
- don't switch manifests for minilayout users.

BUG=chromium-os:32963
TEST=locally

Change-Id: I1d0cbfc9f4f03d85b34810cdb98d99a7a21d8adf
Reviewed-on: https://gerrit.chromium.org/gerrit/28842
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Ryan Cui <rcui@chromium.org>
Commit-Ready: Ryan Cui <rcui@chromium.org>

chroot_version_hooks.d/44_fix_gerrit_chrome

diff --git a/chroot_version_hooks.d/44_fix_gerrit_chrome b/chroot_version_hooks.d/44_fix_gerrit_chrome
index 2f902f8..0213af2 100644
--- a/chroot_version_hooks.d/44_fix_gerrit_chrome
+++ b/chroot_version_hooks.d/44_fix_gerrit_chrome
@@ -15,16 +15,22 @@
 
 chrome_workon="=chromeos-base/chromeos-chrome-9999"
 cros_workon_dir="${HOME}/trunk/.config/cros_workon/*"
+manifest="${HOME}/trunk/.repo/manifest.xml"
 
 if grep -q "${chrome_workon}" ${cros_workon_dir} &> /dev/null; then
-  repo selfupdate && repo init -m gerrit-source.xml
+  if [ $(readlink "${manifest}") != "manifests/minilayout.xml" ]; then
+    repo selfupdate && repo init -m gerrit-source.xml
+  fi
 fi
 
-(
-  cd "${HOME}/trunk/chromium/src"
-  ignore_cmd='git config -f $toplevel/.git/config submodule.$name.ignore all'
-  git submodule foreach "${ignore_cmd}" &> /dev/null
-)
+chromium_dir="${HOME}/trunk/chromium/src"
+if [ -d "${chromium_dir}" ]; then
+  (
+    cd "${chromium_dir}"
+    ignore_cmd='git config -f $toplevel/.git/config submodule.$name.ignore all'
+    git submodule foreach "${ignore_cmd}" &> /dev/null
+  )
+fi
 
 touch "${MARKER}"
 exit 0