From 0361dc39c5a4de01fda05dd026c2573ed55cf016 Mon Sep 17 00:00:00 2001
From: Tom Mast <tom.mast@vodori.com>
Date: Thu, 25 Sep 2014 15:35:45 -0500
Subject: [PATCH] blackbox: Removed the manual gpg --import step from README,
 added prepare_keychain to blackbox_update_all_files

---
 README.md                     | 1 -
 bin/blackbox_update_all_files | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c526ab5..524acc0 100644
--- a/README.md
+++ b/README.md
@@ -496,7 +496,6 @@ git commit -m"Adding key for KEYNAME" pubring.gpg trustdb.gpg blackbox-admins.tx
 Regenerate all encrypted files with the new key:
 
 ```
-gpg --import keyrings/live/pubring.gpg
 blackbox_update_all_files
 git status
 git commit -m"updated encryption" -a
diff --git a/bin/blackbox_update_all_files b/bin/blackbox_update_all_files
index eb9ac86..4e7644d 100755
--- a/bin/blackbox_update_all_files
+++ b/bin/blackbox_update_all_files
@@ -15,6 +15,7 @@ if [[ -z $GPG_AGENT_INFO ]]; then
 fi
 
 disclose_admins
+prepare_keychain
 
 echo '========== ENCRYPTED FILES TO BE RE-ENCRYPTED:'
 awk <"$BB_FILES" '{ print "    " $1 ".gpg" }'