Commit 961090e4 authored by Chaoting Liu's avatar Chaoting Liu
Browse files

revert previous commit, add other key server url

parent 6f6b1dee
...@@ -6,9 +6,9 @@ _do list_packages ...@@ -6,9 +6,9 @@ _do list_packages
# `gpg --recv-key` requires write access to the current user's home directory! # `gpg --recv-key` requires write access to the current user's home directory!
for server in $(shuf -e ha.pool.sks-keyservers.net \ for server in $(shuf -e ha.pool.sks-keyservers.net \
hkp://p80.pool.sks-keyservers.net:80 \ keys.gnupg.net \
keyserver.ubuntu.com \ keyserver.ubuntu.com \
hkp://keyserver.ubuntu.com:80 \ keys.openpgp.org \
pgp.mit.edu) ; do pgp.mit.edu) ; do
gpg --keyserver "$server" --recv-keys $(get_validpgpkeys) && break || : ; gpg --keyserver "$server" --recv-keys $(get_validpgpkeys) && break || : ;
done done
...@@ -169,8 +169,6 @@ function get_validpgpkeys() { ...@@ -169,8 +169,6 @@ function get_validpgpkeys() {
# get unique keys # get unique keys
_VALIDPGPKEYS=($(echo "${_VALIDPGPKEYS[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ')) _VALIDPGPKEYS=($(echo "${_VALIDPGPKEYS[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' '))
_do gpg --recv-keys "${_VALIDPGPKEYS[@]}" --keyserver keys.openpgp.org
} }
# Sort packages by dependency # Sort packages by dependency
...@@ -241,7 +239,6 @@ function get_repository() { ...@@ -241,7 +239,6 @@ function get_repository() {
# builds all $PACKAGES in the given order # builds all $PACKAGES in the given order
function build_packages() { function build_packages() {
_log build_step "Start building packages: ${PACKAGES[@]}" _log build_step "Start building packages: ${PACKAGES[@]}"
_log get_validpgpkeys
for p in "${PACKAGES[@]}"; do for p in "${PACKAGES[@]}"; do
# resync to update local repo # resync to update local repo
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment