Merge pull request #94950 from dashpole/empty_package_vendor

Fix empty package license generation
This commit is contained in:
Kubernetes Prow Robot 2020-09-23 10:14:39 -07:00 committed by GitHub
commit 8eda21ea3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -197,19 +197,25 @@ for PACKAGE in $(go list -m -json all | jq -r .Path | sort -f); do
continue continue
fi fi
# Skip a directory if 1) it has no files and 2) all the subdirectories contain a go.mod file. # Skip a directory if 1) it has no files and 2) all the subdirectories contain a go.mod file.
if [[ -z "$(find "${DEPS_DIR}/${PACKAGE}/" -mindepth 1 -maxdepth 1 -type f)" ]]; then
misses_go_mod=false misses_go_mod=false
DEPS_SUBDIR="${DEPS_DIR}/${PACKAGE}"
search_for_mods () {
if [[ -z "$(find "${DEPS_SUBDIR}/" -mindepth 1 -maxdepth 1 -type f)" ]]; then
while read -d "" -r SUBDIR; do while read -d "" -r SUBDIR; do
if [[ ! -e "${SUBDIR}/go.mod" ]]; then if [[ ! -e "${SUBDIR}/go.mod" ]]; then
misses_go_mod=true DEPS_SUBDIR=${SUBDIR}
break search_for_mods
fi fi
done < <(find "${DEPS_DIR}/${PACKAGE}/" -mindepth 1 -maxdepth 1 -type d -print0) done < <(find "${DEPS_SUBDIR}/" -mindepth 1 -maxdepth 1 -type d -print0)
else
misses_go_mod=true
fi
}
search_for_mods
if [[ $misses_go_mod = false ]]; then if [[ $misses_go_mod = false ]]; then
echo "${PACKAGE} has no files, skipping" >&2 echo "${PACKAGE} has no files, skipping" >&2
continue continue
fi fi
fi
echo "${PACKAGE}" echo "${PACKAGE}"
process_content "${PACKAGE}" LICENSE process_content "${PACKAGE}" LICENSE