summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2015-03-06 08:37:25 +0100
committerPierre Schmitz <pierre@archlinux.de>2015-05-14 10:36:24 +0200
commit49ad7e6dbe5be1d7eac9108073a2a09c81dc2aa2 (patch)
tree524bd061716af7b6090162fd71488f11f0453aac
parent85705363cd05b79fc1a328260b199c9321a0f105 (diff)
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. Signed-off-by: Christian Hesse <mail@eworm.de> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
-rw-r--r--makechrootpkg.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index cc02547..207a148 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -156,7 +156,8 @@ prepare_chroot() {
# Read .makepkg.conf and gnupg pubring
if [[ -r $USER_HOME/.gnupg/pubring.kbx ]]; then
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"
fi