fix handling of public keyring

Chances are that pubring.kbx has been created by gpgsm but pubring.gpg
is still around with valid data. We do not know what file contains what
we need, so just copy both.
https://projects.archlinux.org/devtools.git/commit/?id=49ad7e6dbe5be1d7eac9108073a2a09c81dc2aa2
This commit is contained in:
Ramon Buldó 2015-05-14 11:10:38 +02:00
parent 9a71c3923e
commit 16b86166d6

View file

@ -195,7 +195,8 @@ prepare_chroot() {
# fi # fi
if [[ -r $USER_HOME/.gnupg/pubring.kbx ]]; then if [[ -r $USER_HOME/.gnupg/pubring.kbx ]]; then
install -D "$USER_HOME/.gnupg/pubring.kbx" "$copydir/build/.gnupg/pubring.kbx" install -D "$USER_HOME/.gnupg/pubring.kbx" "$copydir/build/.gnupg/pubring.kbx"
elif [[ -r $USER_HOME/.gnupg/pubring.gpg ]]; then fi
if [[ -r $USER_HOME/.gnupg/pubring.gpg ]]; then
install -D "$USER_HOME/.gnupg/pubring.gpg" "$copydir/build/.gnupg/pubring.gpg" install -D "$USER_HOME/.gnupg/pubring.gpg" "$copydir/build/.gnupg/pubring.gpg"
fi fi