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