diff options
| author | milki <milki@rescomp.berkeley.edu> | 2014-05-14 00:15:17 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2014-05-14 00:15:17 +0200 |
| commit | e4e0bdfa73fbdb21e93e69c3ad9d66414681201c (patch) | |
| tree | f1fd7155355bfec8bfe94bc54799d618fb93924f | |
| parent | 311c98c9140205f32be2720db9261c67da658c4c (diff) | |
Disable secmem warning when discovering keys
Key discovery parses stderr output of gnupg. The secmem warning
interferes with parsing.
| -rwxr-xr-x | src/password-store.sh | 2 | ||||
| -rwxr-xr-x | tests/t0300-reencryption.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/password-store.sh b/src/password-store.sh index 140b1bc..dadeea4 100755 --- a/src/password-store.sh +++ b/src/password-store.sh @@ -110,7 +110,7 @@ reencrypt_path() { done gpg_keys="$($GPG --list-keys --keyid-format long "${GPG_RECIPIENTS[@]}" | sed -n 's/sub *.*\/\([A-F0-9]\{16\}\) .*/\1/p' | LC_ALL=C sort -u)" fi - current_keys="$($GPG -v --list-only --keyid-format long "$passfile" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u)" + current_keys="$($GPG -v --no-secmem-warning --no-permission-warning --list-only --keyid-format long "$passfile" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u)" if [[ $gpg_keys != "$current_keys" ]]; then echo "$passfile_display: reencrypting to ${gpg_keys//$'\n'/ }" diff --git a/tests/t0300-reencryption.sh b/tests/t0300-reencryption.sh index b595511..96da41b 100755 --- a/tests/t0300-reencryption.sh +++ b/tests/t0300-reencryption.sh @@ -10,7 +10,7 @@ canonicalize_gpg_keys() { $GPG --list-keys --keyid-format long "$@" | sed -n 's/sub *.*\/\([A-F0-9]\{16\}\) .*/\1/p' | sort -u } gpg_keys_from_encrypted_file() { - $GPG -v --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | sort -u + $GPG -v --no-secmem-warning --no-permission-warning --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | sort -u } gpg_keys_from_group() { local output="$($GPG --list-config --with-colons | sed -n "s/^cfg:group:$1:\\(.*\\)/\\1/p" | head -n 1)" |