diff options
| author | Christian Hesse <mail@eworm.de> | 2015-01-17 00:06:24 +0100 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2015-02-28 10:48:06 -0500 |
| commit | 4a9ecdfe156f9887d88eb7ae026387f0e051a6a5 (patch) | |
| tree | c56ff4b9298ebd2dd6edb3e609f06ad89b5e92fb | |
| parent | 33fda4e8ffab293d2cbc6a8e8e9dd38f15817e5b (diff) | |
| download | devtools32-4a9ecdfe156f9887d88eb7ae026387f0e051a6a5.tar.xz | |
handle gnupg 2.1.x public keyring
| -rw-r--r-- | makechrootpkg.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index 466cb92..cc02547 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -153,10 +153,11 @@ prepare_chroot() { echo 'BUILDDIR="/build"' >> "$copydir/etc/makepkg.conf" fi - # Read .makepkg.conf and .gnupg/pubring.gpg even if called via sudo - if [[ -r "$USER_HOME/.gnupg/pubring.gpg" ]]; then - install -D "$USER_HOME/.gnupg/pubring.gpg" \ - "$copydir/build/.gnupg/pubring.gpg" + # 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 + install -D "$USER_HOME/.gnupg/pubring.gpg" "$copydir/build/.gnupg/pubring.gpg" fi mkdir -p "$copydir/pkgdest" |