From 73e46fc0d25bc86f7ba1428ea58133a90c176106 Mon Sep 17 00:00:00 2001 From: udeved Date: Sat, 28 Feb 2015 23:20:12 +0100 Subject: [PATCH] [mkchrootpkg] sync with devtools --- bin/mkchrootpkg.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/mkchrootpkg.in b/bin/mkchrootpkg.in index 7ddd324..f1acb47 100644 --- a/bin/mkchrootpkg.in +++ b/bin/mkchrootpkg.in @@ -189,9 +189,14 @@ prepare_chroot() { 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" +# if [[ -r "$USER_HOME/.gnupg/pubring.gpg" ]]; then +# install -D "$USER_HOME/.gnupg/pubring.gpg" \ +# "$copydir/build/.gnupg/pubring.gpg" +# fi + 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"