languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-18 21:41:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[gardening] Fix hhh patch apply.sh so it skips newly added, non-existent dependency folders

Browse source 
Change-Id: Ia2e4639294b5cfb0a33c672c4eb8beea16ce677f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/111121
Reviewed-by: Alexander Aprelev <aam@google.com>
This commit is contained in:
Alexander Aprelev 2019-07-30 17:12:49 +00:00
parent dddd58b3d3
commit 6e48c00c46
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tools/patches/flutter-engine/apply.sh
View file

@ -70,17 +70,19 @@ if [ $need_runhooks = true ]; then
# them and comparing resulting hashes.
# Note: tag^0 forces rev-parse to return commit hash rather then the hash of
# the tag object itself.
pushd ${dependency_path} > /dev/null
if [ $(git rev-parse HEAD) != $(git rev-parse ${dependency_tag_or_hash}^0) ]; then
echo "${dependency_path} requires update to match DEPS file"
if [ "$git_cache" != "" ]; then
echo "--- Forcing update of the git_cache ${git_cache}"
git cache fetch -c ${git_cache} --all -v
if [ -e ${dependency_path} ]; then
pushd ${dependency_path} > /dev/null
if [ $(git rev-parse HEAD) != $(git rev-parse ${dependency_tag_or_hash}^0) ]; then
echo "${dependency_path} requires update to match DEPS file"
if [ "$git_cache" != "" ]; then
echo "--- Forcing update of the git_cache ${git_cache}"
git cache fetch -c ${git_cache} --all -v
fi
git fetch origin
git checkout ${dependency_tag_or_hash}
fi
git fetch origin
git checkout ${dependency_tag_or_hash}
popd > /dev/null
fi
popd > /dev/null
done
gclient.py runhooks
fi