Merge pull request #223 from jinnko/master

Exclude our default keyring from import

bin/_blackbox_common.sh

@@ -184,7 +184,7 @@ function prepare_keychain() {
   # NB: We must export the keys to a format that can be imported.
   make_self_deleting_tempfile keyringasc
   export LANG="C.UTF-8"
-  $GPG --export --keyring "$(get_pubring_path)" >"$keyringasc"
+  $GPG --export --no-default-keyring --keyring "$(get_pubring_path)" >"$keyringasc"
   $GPG --import "$keyringasc" 2>&1 | egrep -v 'not changed$' >&2
   echo '========== Importing keychain: DONE' >&2
 }