diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2014-12-23 21:06:37 -0500 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-12-27 17:08:33 +1000 |
| commit | 6356567ae0fb9927c80811642e7d949270fd5784 (patch) | |
| tree | fbb6cad128709a1fd18b1f1eb343b9cd1341b77c | |
| parent | 7c0ff7f4b7a88e10e8e9c3f4b90ca359eb0babef (diff) | |
makepkg: print the name of the source array being checked
I don't see an easy fix to avoid printing this more than once, so let's
at least differentiate the messaging so that it's more clear what's
going on.
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c6892821..440848f4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1284,22 +1284,23 @@ verify_integrity_one() { } verify_integrity_sums() { - local integ=$1 arch=$2 integrity_sums=() sources=() + local integ=$1 arch=$2 integrity_sums=() sources=() srcname if [[ $arch ]]; then array_build integrity_sums "${integ}sums_$arch" - array_build sources "source_$arch" + srcname=source_$arch else array_build integrity_sums "${integ}sums" - array_build sources source + srcname=source fi + array_build sources "$srcname" if (( ${#integrity_sums[@]} == 0 && ${#sources[@]} == 0 )); then return 1 fi if (( ${#integrity_sums[@]} == ${#sources[@]} )); then - msg "$(gettext "Validating source files with %s...")" "${integ}sums" + msg "$(gettext "Validating %s files with %s...")" "$srcname" "${integ}sums" local idx errors=0 for (( idx = 0; idx < ${#sources[*]}; idx++ )); do verify_integrity_one "${sources[idx]}" "$integ" "${integrity_sums[idx]}" || errors=1 |