File tree Expand file tree Collapse file tree 2 files changed +6
-4
lines changed
Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -107,12 +107,11 @@ function download_archive_package () {
107107 if verify_archive_link " ${target} " ; then
108108 local filename=" $( basename ${target} ) "
109109 echo " Downloading ${filename} " >&2
110- curl -L --remote-name-all " ${target} " " ${target} .sig" 2> /dev/null
111- if gpg --keyring /etc/pacman.d/gnupg/pubring.gpg --verify " ${filename} .sig" " ${filename} " 2> /dev/null; then
112- mv " ${filename} " " ${cachedir} /"
110+ if curl -L --remote-name-all " ${target} " " ${target} .sig" 2> /dev/null; then
111+ mv " ${filename} " {,.sig} " ${cachedir} /"
113112 echo " ${2} /${filename} "
114113 else
115- echo " ${filename} doesn 't pass signature verification " >&2
114+ echo " Couldn 't download ${filename} " >&2
116115 echo " check ${workdir} " >&2
117116 exit 1
118117 fi
Original file line number Diff line number Diff line change @@ -247,6 +247,9 @@ function cmd_check(){
247247 printf ' PKGEXT=".pkg.tar%s"\n' " ${pkg##* tar} "
248248 } >> " $BUILDDIRECTORY /$build /etc/makepkg.conf"
249249
250+ # We do the signature checking with pacman -Udd
251+ sed -i " s/LocalFileSigLevel.*//g" " $BUILDDIRECTORY /$build /etc/pacman.conf"
252+
250253 # Father I have sinned
251254 exec_nspawn " build" \
252255 bash << -__END__
You can’t perform that action at this time.
0 commit comments