]> git.lizzy.rs Git - torbrowser-launcher.git/commitdiff
made gpg keys get imported one after the other, fixes #20
authorMicah Lee <micahflee@riseup.net>
Tue, 9 Apr 2013 18:28:33 +0000 (11:28 -0700)
committerMicah Lee <micahflee@riseup.net>
Tue, 9 Apr 2013 18:28:33 +0000 (11:28 -0700)
torbrowser-launcher

index 01a30701dbfceb3656505d7294bd7efb9de24c76..913167597f4e1b71b96c34c1044b42a9ddf9c3a3 100755 (executable)
@@ -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