Skip to content

Commit

Permalink
Auto merge of #41147 - aidanhs:aphs-fix-appveyor-cache, r=TimNN
Browse files Browse the repository at this point in the history
Disable errexit for sanity checking git repo

Unblock appveyor
  • Loading branch information
bors committed Apr 8, 2017
2 parents 53f4bc3 + bd4f381 commit 547c12b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/ci/init_repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ if [ ! -f "$cache_valid_file" ]; then
rm -rf "$CACHE_DIR"
mkdir "$CACHE_DIR"
else
set +o errexit
stat_lines=$(cd "$cache_src_dir" && git status --porcelain | wc -l)
stat_ec=$(cd "$cache_src_dir" && git status >/dev/null 2>&1 && echo $?)
stat_ec=$(cd "$cache_src_dir" && git status >/dev/null 2>&1; echo $?)
set -o errexit
if [ ! -d "$cache_src_dir/.git" -o $stat_lines != 0 -o $stat_ec != 0 ]; then
# Something is badly wrong - the cache valid file is here, but something
# about the git repo is fishy. Nuke it all, just in case
Expand Down

0 comments on commit 547c12b

Please sign in to comment.