Skip to content

Commit

Permalink
deps: Handle empty/no archful deps files correctly
Browse files Browse the repository at this point in the history
If no line is selected by grep, non-zero code is returned. Skip that deps file if is not needed on that arch, missing or zero lenght.
  • Loading branch information
jcajka authored and openshift-merge-robot committed Mar 25, 2020
1 parent d81e3c2 commit c2759d6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
Empty file removed src/deps-aarch64.txt
Empty file.
5 changes: 4 additions & 1 deletion src/print-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,8 @@ srcdir="$(cd "$(dirname "$0")" && pwd)"
arch="$(arch)"
for x in deps vmdeps; do
grep -v '^#' "${srcdir}/${x}.txt"
grep -v '^#' "${srcdir}/${x}-${arch}.txt"
# There might not be any archful dependencies
if [ -s "${srcdir}/${x}-${arch}.txt" ]; then
grep -v '^#' "${srcdir}/${x}-${arch}.txt"
fi
done

0 comments on commit c2759d6

Please sign in to comment.