kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Fix vendor validation 

Previously adding files to vendor/ without adding to vendor.conf would not fail the
validation.

Also be consistent with indentation and use tabs.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
Daniel Nephin 2018-02-02 10:43:36 -08:00
parent 81e651c6d2
commit 075fd7a9be
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hack/validate/vendor
View File

@ -9,9 +9,13 @@ validate_vendor_diff(){
unset IFS unset IFS
if [ ${#files[@]} -gt 0 ]; then if [ ${#files[@]} -gt 0 ]; then
# We run vndr to and see if we have a diff afterwards # Remove vendor/ first so that anything not included in vendor.conf will
# cause the validation to fail. archive/tar is a special case, see vendor.conf
# for details.
ls -d vendor/* | grep -v vendor/archive | xargs rm -rf
# run vndr to recreate vendor/
vndr vndr
# Let see if the working directory is clean # check if any files have changed
diffs="$(git status --porcelain -- vendor 2>/dev/null)" diffs="$(git status --porcelain -- vendor 2>/dev/null)"
if [ "$diffs" ]; then if [ "$diffs" ]; then
{ {