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>
This commit is contained in:
Ryan Cui 2012-07-31 11:55:58 -07:00 committed by Gerrit
parent 308813b5fe
commit e09d3c2fd5

View File

@ -15,16 +15,22 @@ fi
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