tools/confidence_test.sh: now works with gnupg-2.0 again

2017-05-14 17:52:27 -04:00
parent eaa6d06b3e
commit 50ac1697c3
2 changed files with 11 additions and 1 deletions
--- a/tools/test_functions.sh
+++ b/tools/test_functions.sh
@@ -1,5 +1,15 @@
 #!/usr/bin/env bash

+# NB: This is copied from _blackbox_common.sh
+function get_pubring_path() {
+  : "${KEYRINGDIR:=keyrings/live}" ;
+  if [[ -f "${KEYRINGDIR}/pubring.gpg" ]]; then
+    echo "${KEYRINGDIR}/pubring.gpg"
+  else
+    echo "${KEYRINGDIR}/pubring.kbx"
+  fi
+}
+
 function PHASE() {
  echo '********************'
  echo '********************'