Merge branch 'archlinux'libretools-20150526

2 files changed, 3 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 4ebfd1e..646258c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V=20150228
+V=20150514
 
 PREFIX = /usr/local
 
diff --git a/makechrootpkg.in b/makechrootpkg.in
index ad5e3d9..8f07dc1 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -157,7 +157,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