diff options
| author |   Andreas Stieger <astieger@suse.com> | 2017-03-10 15:43:26 +0100 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-03-20 15:46:50 +0100 |
| commit | 6f867674272a03273212259b9039c9356a6ed90f (patch) | |
| tree | db56a84f667e5510185140951b6a974a4d3108a9 /tests | |
| parent | tests: fix on OSX by not using the tr hack (diff) | |
| download | password-store-6f867674272a03273212259b9039c9356a6ed90f.tar.xz password-store-6f867674272a03273212259b9039c9356a6ed90f.zip | |
Fix compatibility with GnuPG 2.2.19
GnuPG 2.2.19 added a warning when no command was given.
* src/password-store.sh (reencrypt_path): Add --decrypt to --list-only
* tests/t0300-reencryption.sh (gpg_keys_from_encrypted_file): same
https://bugs.gnupg.org/gnupg/msg9873
http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=810adfd47801fc01e45fb71af9f05c91f7890cdb
https://bugzilla.suse.com/show_bug.cgi?id=1028867
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/t0300-reencryption.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/t0300-reencryption.sh b/tests/t0300-reencryption.sh index 9d46580..6d5811d 100755 --- a/tests/t0300-reencryption.sh +++ b/tests/t0300-reencryption.sh @@ -10,7 +10,7 @@ canonicalize_gpg_keys() { $GPG --list-keys --with-colons "$@" | sed -n 's/sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u } gpg_keys_from_encrypted_file() { - $GPG -v --no-secmem-warning --no-permission-warning --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u + $GPG -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u } gpg_keys_from_group() { local output="$($GPG --list-config --with-colons | sed -n "s/^cfg:group:$1:\\(.*\\)/\\1/p" | head -n 1)" |