Skip to content

Commit a165c67

Browse files
committed
3rdparty: Fix revision check
* Add a few nice to haves Change-Id: I53e1fd7d067357af5ad625ebf86de3ee68903cbe
1 parent 445d4fd commit a165c67

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

3rdparty/kallisti5/validateBootstrapRepo

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ if [[ ! -d $REPOFILES ]]; then
2020
fi
2121

2222
RESULT=0
23-
for f in $(find $REPOFILES -print); do
23+
for f in $(find $REPOFILES -maxdepth 1 -type f -print); do
2424
ARCHITECTURE=$(cat $f | tr '\n' ' ' | awk '{ print $4 } ')
25-
echo "================ Scanning $ARCHITECTURE"
25+
echo "================ Scanning $ARCHITECTURE / $f"
2626
REPO_EXPECT=$(cat $f | grep -v "#" | grep '-' | grep 'bootstrap' | grep -v 'bootstrap_')
2727
for i in $REPO_EXPECT; do
2828
PACKAGE=$(echo $i | cut -d'-' -f1)
@@ -36,12 +36,13 @@ for f in $(find $REPOFILES -print); do
3636
RESULT=1
3737
continue
3838
fi
39-
grep "REVISION=$REV" $RECIPE > /dev/null
40-
#echo $RECIPE
39+
REV=$(echo $i | cut -d'-' -f3)
40+
grep "REVISION=\"$REV\"" $RECIPE > /dev/null
4141
if [[ $? -eq 0 ]]; then
4242
echo " $ARCHITECTURE $i... OK"
4343
else
44-
echo " $ARCHITECTURE $i... ERROR (Incorrect revision!)"
44+
FOUND_REV=$(grep "REVISION=" $RECIPE | cut -d'=' -f2)
45+
echo " $ARCHITECTURE $i... ERROR (Incorrect revision! Found $FOUND_REV!)"
4546
RESULT=1
4647
fi
4748
#echo $i - $PACKAGE

0 commit comments

Comments
 (0)