commit: a6267f74a20233bd45161370558ce0a11b47dca8
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 15:55:12 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 25 15:55:12 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=a6267f74
tests/qmanifest: forgot about set -e, work around it
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
tests/qmanifest/dotest | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tests/qmanifest/dotest b/tests/qmanifest/dotest
index a6b1431..abab463 100755
--- a/tests/qmanifest/dotest
+++ b/tests/qmanifest/dotest
@@ -63,11 +63,10 @@ gpg_import() {
local killpinentry="--pinentry-mode loopback"
# see if gpg is new enough for killpinentry
- echo "${pass}" | gpg -n ${killpinentry} "${args[@]}"
- if [[ $? -ne 0 ]] ; then
- echo "${pass}" | gpg "${args[@]}"
- else
+ if echo "${pass}" | gpg -n ${killpinentry} "${args[@]}" ; then
echo "${pass}" | gpg ${killpinentry} "${args[@]}"
+ else
+ echo "${pass}" | gpg "${args[@]}"
fi
}
# import key and sanity check
