starlingx/root
Code Issues Proposed changes

Merge "Build contexts should not include .repo/repo"

Browse Source
This commit is contained in:
Zuul 2020-08-31 19:36:03 +00:00 committed by Gerrit Code Review
commit 3d1bdb2812
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build-tools/git-utils.sh
View File

@ -27,7 +27,7 @@ git_ctx_root_dir () {
git_list () { git_list () {
local DIR=${1} local DIR=${1}
find -L "${DIR}" -maxdepth 5 -type d -name '.git' -exec dirname {} \; | sort -V find -L "${DIR}" -maxdepth 5 -type d -name '.git' -exec dirname {} \; | grep -v '[.]repo[/]repo$' | sort -V
} }
@ -380,11 +380,12 @@ git_test_context () {
# Limit search to last 500 commits in the interest of speed. # Limit search to last 500 commits in the interest of speed.
# I don't expect to be using contexts more than a few weeks old. # I don't expect to be using contexts more than a few weeks old.
cat "$context" | \ cat "$context" | \
sed "s#checkout -f \([a-e0-9]*\)#rev-list --max-count=500 HEAD | \ sed -e "s/\.repo\/repo/d" \
-e "s#checkout -f \([a-e0-9]*\)#rev-list --max-count=500 HEAD | \
grep \1#" > $query grep \1#" > $query
target_hits=$(cat "$context" | wc -l) target_hits=$(cat "$context" | grep -v '[.]repo[/]repo ' | wc -l)
actual_hits=$(cd $(git_ctx_root_dir); source $query | wc -l) actual_hits=$(cd $(git_ctx_root_dir); source $query 2> /dev/null | wc -l)
\rm $query \rm $query
if [ $actual_hits -eq $target_hits ]; then if [ $actual_hits -eq $target_hits ]; then