[Pkg-privacy-commits] [torbrowser-launcher] 104/476: made gpg keys get imported one after the other, fixes #20

[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 841c51f354c40aad4874ceeafd9dce4c941c4f10
Author: Micah Lee <micahflee at riseup.net>
Date:   Tue Apr 9 11:28:33 2013 -0700

    made gpg keys get imported one after the other, fixes #20
---
 torbrowser-launcher | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/torbrowser-launcher b/torbrowser-launcher
index 01a3070..9131675 100755
--- a/torbrowser-launcher
+++ b/torbrowser-launcher
@@ -279,9 +279,8 @@ class TorBrowserLauncher:
                 # import keys
                 print _('Importing keys')
                 p1 = subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['dir']['gnupg_homedir'], '--import', self.paths['file']['erinn_key']])
-                p2 = subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['dir']['gnupg_homedir'], '--import', self.paths['file']['sebastian_key']])
-                # wait for keys to import before moving on
                 p1.wait()
+                p2 = subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['dir']['gnupg_homedir'], '--import', self.paths['file']['sebastian_key']])
                 p2.wait()
 
     # there are different GUIs that might appear, this sets which one we want

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