[Pkg-privacy-commits] [torbrowser-launcher] 30/48: Only refresh the keyring, don't try to get new keys.

[Roger Shimizu]

This is an automated email from the git hooks/post-receive script.

rosh pushed a commit to branch debian/sid
in repository torbrowser-launcher.

commit 87338d1c10ab6f9f438da247126b7fdf7ac44f11
Author: Dan Snider <dan at dephekt.net>
Date:   Fri Apr 21 17:01:49 2017 -0500

    Only refresh the keyring, don't try to get new keys.
---
 torbrowser_launcher/common.py | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
index 710fe24..d9eab99 100644
--- a/torbrowser_launcher/common.py
+++ b/torbrowser_launcher/common.py
@@ -206,19 +206,14 @@ class Common:
         self.import_keys()
 
     def refresh_keyring(self, fingerprint=None):
-        if fingerprint is not None:
-            p = subprocess.Popen(['/usr/bin/gpg', '--status-fd', '2',
-                                  '--homedir', self.paths['gnupg_homedir'],
-                                  '--keyserver', 'pool.sks-keyservers.net',
-                                  '--recv-keys', fingerprint], stderr=subprocess.PIPE)
+        p = subprocess.Popen(['/usr/bin/gpg', '--status-fd', '2',
+                              '--homedir', self.paths['gnupg_homedir'],
+                              '--keyserver', 'pool.sks-keyservers.net',
+                              '--refresh-keys'], stderr=subprocess.PIPE)
 
-            print('Refreshing Missing public key(s): ' + fingerprint)
+        if fingerprint is not None:
+            print('Refreshing local keyring. Missing key: ' + fingerprint)
         else:
-            p = subprocess.Popen(['/usr/bin/gpg', '--status-fd', '2',
-                                  '--homedir', self.paths['gnupg_homedir'],
-                                  '--keyserver', 'pool.sks-keyservers.net',
-                                  '--refresh-keys'], stderr=subprocess.PIPE)
-
             print('Refreshing local keyring.')
 
     def import_key_and_check_status(self, key):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git