[Pkg-privacy-commits] [torbrowser-launcher] 154/476: now imports gpg keys on startup each time, to ensure that upgrading users get Mike Perry's key (#49)

[Ximin Luo]

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

infinity0 pushed a commit to branch debian
in repository torbrowser-launcher.

commit 93f8080c43e5125deaa21d47cb61968ba3b0d224
Author: Micah Lee <micahflee at riseup.net>
Date:   Fri Aug 9 16:22:23 2013 -0700

    now imports gpg keys on startup each time, to ensure that upgrading users get Mike Perry's key (#49)
---
 torbrowser-launcher | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/torbrowser-launcher b/torbrowser-launcher
index 87bdafc..1c5553e 100755
--- a/torbrowser-launcher
+++ b/torbrowser-launcher
@@ -227,16 +227,13 @@ class TBLCommon:
     def init_gnupg(self):
         if not os.path.exists(self.paths['gnupg_homedir']):
             print _('Creating GnuPG homedir'), self.paths['gnupg_homedir']
-            if self.mkdir(self.paths['gnupg_homedir']):
-                self.import_keys()
+            self.mkdir(self.paths['gnupg_homedir'])
+        self.import_keys()
 
     # import gpg keys
     def import_keys(self):
         print _('Importing keys')
-        subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['gnupg_homedir'], '--import', self.paths['erinn_key']]).wait()
-        subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['gnupg_homedir'], '--import', self.paths['sebastian_key']]).wait()
-        subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['gnupg_homedir'], '--import', self.paths['alexandre_key']]).wait()
-        subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['gnupg_homedir'], '--import', self.paths['mike_key']]).wait()
+        subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['gnupg_homedir'], '--import', self.paths['erinn_key'], self.paths['sebastian_key'], self.paths['alexandre_key'], self.paths['mike_key']]).wait()
 
     # load mirrors
     def load_mirrors(self):
@@ -315,9 +312,6 @@ class TBLCommon:
                     pass
                 if os.path.exists(self.paths['data_dir']+'/tbb/i686'):
                     pass
-                
-                # 0.0.2 added Mike Perry's key
-                self.import_keys()
 
         else:
             self.settings = default_settings

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