torproject/torbrowser-launcher
1
0
Fork 0
mirror of https://github.com/torproject/torbrowser-launcher.git synced 2024-11-27 03:20:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Read gpg output a line at a time, looking for status-fd output

Browse Source
This commit is contained in:
Micah Lee 2016-07-08 16:39:43 -07:00
parent 3dc82e10de
commit 0bb3764b9f
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
torbrowser_launcher/common.py
View File

@ -212,14 +212,14 @@ class Common:
stderr=subprocess.PIPE)
p.wait()
output = p.stderr.read()
print "---output begin---\n{}\n---output end---".format(output)
match = gnupg_import_ok_pattern.match(output)
if match:
# The output must match everything in the
# ``gnupg_import_ok_pattern``, as well as the expected fingerprint:
if match.group().find(self.fingerprints[key]) >= 0:
success = True
for output in p.stderr.readlines():
match = gnupg_import_ok_pattern.match(output)
if match:
# The output must match everything in the
# ``gnupg_import_ok_pattern``, as well as the expected fingerprint:
if match.group().find(self.fingerprints[key]) >= 0:
success = True
break
return success
@ -231,12 +231,6 @@ class Common:
:returns: ``True`` if all keys were successfully imported; ``False``
otherwise.
"""
# run "gpg --list-keys" first, to create an empty keyring before importing
#subprocess.call(['/usr/bin/gpg',
# '--homedir', self.paths['gnupg_homedir'],
# '--list-secret-keys'])
keys = ['tor_browser_developers',]
all_imports_succeeded = True