aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2019-05-25 17:55:12 +0200
committerFabian Groffen <grobian@gentoo.org>2019-05-25 17:55:12 +0200
commita6267f74a20233bd45161370558ce0a11b47dca8 (patch)
tree32607b7b9db740d78bd3a182258267e3aff21074 /tests
parenttests/qmanifest: try and work with old gpg (diff)
downloadportage-utils-a6267f74a20233bd45161370558ce0a11b47dca8.tar.gz
portage-utils-a6267f74a20233bd45161370558ce0a11b47dca8.tar.bz2
portage-utils-a6267f74a20233bd45161370558ce0a11b47dca8.zip
tests/qmanifest: forgot about set -e, work around it
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/qmanifest/dotest7
1 files 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