From 620f77fbe9424801c65692e74b0387e4b909255a Mon Sep 17 00:00:00 2001
From: Jinn Koriech <jinnko@users.noreply.github.com>
Date: Tue, 4 Jul 2017 15:32:48 +0100
Subject: [PATCH] Silence 'not changed' output during keychain import (#200)

Previously the keychain import appears to have redirected stderr to stdout,
silenced lines that indicate a key has 'not changed' then send the output back
to stdout.  This behaviour has been carried over to the new GnuPG-2.1
compatible implementation.
---
 bin/_blackbox_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/_blackbox_common.sh b/bin/_blackbox_common.sh
index c21d70c..fb30bdd 100755
--- a/bin/_blackbox_common.sh
+++ b/bin/_blackbox_common.sh
@@ -201,7 +201,7 @@ function prepare_keychain() {
   make_self_deleting_tempfile keyringasc
   export LANG="C.UTF-8"
   $GPG --export --keyring "$(get_pubring_path)" >"$keyringasc"
-  $GPG --import "$keyringasc"
+  $GPG --import "$keyringasc" 2>&1 | egrep -v 'not changed$' >&2
   echo '========== Importing keychain: DONE' >&2
 }