Unsignedio
/
python-gnupg
mirror of https://github.com/markqvist/python-gnupg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'charles-dyfis-net/trustdb_repair_arg_fix' into develop

fix/83-SIG_SUBPACKET
Isis Lovecruft 2014-11-19 21:29:31 +00:00
parent 30c8c05f84 98e0fc7cf5
commit 8e5b3256fa
No known key found for this signature in database
GPG Key ID: 18C16EC5F9F1D673
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnupg/_trust.py
View File

@ -57,7 +57,7 @@ def export_ownertrust(cls, trustdb=None):
except (OSError, IOError) as err: except (OSError, IOError) as err:
log.debug(str(err)) log.debug(str(err))
export_proc = cls._open_subprocess('--export-ownertrust') export_proc = cls._open_subprocess(['--export-ownertrust'])
tdb = open(trustdb, 'wb') tdb = open(trustdb, 'wb')
_util._threaded_copy_data(export_proc.stdout, tdb) _util._threaded_copy_data(export_proc.stdout, tdb)
@ -71,7 +71,7 @@ def import_ownertrust(self, trustdb=None):
if trustdb is None: if trustdb is None:
trustdb = os.path.join(cls.homedir, 'trustdb.gpg') trustdb = os.path.join(cls.homedir, 'trustdb.gpg')
import_proc = cls._open_subprocess('--import-ownertrust') import_proc = cls._open_subprocess(['--import-ownertrust'])
tdb = open(trustdb, 'rb') tdb = open(trustdb, 'rb')
_util._threaded_copy_data(tdb, import_proc.stdin) _util._threaded_copy_data(tdb, import_proc.stdin)
@ -98,6 +98,6 @@ def fix_trustdb(cls, trustdb=None):
""" """
if trustdb is None: if trustdb is None:
trustdb = os.path.join(cls.homedir, 'trustdb.gpg') trustdb = os.path.join(cls.homedir, 'trustdb.gpg')
export_proc = cls._open_subprocess('--export-ownertrust') export_proc = cls._open_subprocess(['--export-ownertrust'])
import_proc = cls._open_subprocess('--import-ownertrust') import_proc = cls._open_subprocess(['--import-ownertrust'])
_util._threaded_copy_data(export_proc.stdout, import_proc.stdin) _util._threaded_copy_data(export_proc.stdout, import_proc.stdin)