diff options
| -rwxr-xr-x | scripts/build/bootstrap_archives | 7 | ||||
| -rwxr-xr-x | scripts/build/chroot_archives | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives index a5eca16a0..9e94680eb 100755 --- a/scripts/build/bootstrap_archives +++ b/scripts/build/bootstrap_archives @@ -222,7 +222,12 @@ then do if [ -e "${FILE}" ] then - cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc + if grep -q "PGP PUBLIC KEY BLOCK" "${FILE}" + then + cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc + else + cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).gpg + fi fi done fi diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 2332388ba..11a5c4a80 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -353,7 +353,12 @@ EOF do if [ -e "${FILE}" ] then - cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc + if grep -q "PGP PUBLIC KEY BLOCK" "${FILE}" + then + cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc + else + cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).gpg + fi fi done fi |