[pacman-dev] [PATCH 1/2] makepkg: call out the source array(s) missing checksums
--- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d53c39f..52928e4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1352,7 +1352,7 @@ check_checksums() { done if (( ${#correlation[*]} )); then - error "$(gettext "Integrity checks are missing.")" + error "$(gettext "Integrity checks are missing for: %s")" "${!correlation[*]}" exit 1 # TODO: error code fi } -- 2.2.1
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. --- scripts/makepkg.sh.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 52928e4..cf753dc 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 -- 2.2.1
participants (1)
-
Dave Reisner