diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-05-17 19:14:04 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-05-17 19:14:04 -0400 |
| commit | b04dc724f01f47107b31b791950d22c27aca7d9b (patch) | |
| tree | 94b5946c07eabe56fc25fd249bd42d528ae399c6 | |
| parent | f112d1655963668d67126cd9becfc1f9b873ecbb (diff) | |
| parent | a1594ae1f6cd183efaee5c52eca01fe5d708b1e1 (diff) | |
| download | devtools32-b04dc724f01f47107b31b791950d22c27aca7d9b.tar.xz | |
Merge branch 'archlinux'libretools-20150526
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | makechrootpkg.in | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -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 |