Change how we create the pubring.gpg and secring.gpg.

feature/documentation-builds-html
Isis Lovecruft 2013-04-12 00:02:49 +00:00
parent a4b8c7823f
commit 85fc2692a5
No known key found for this signature in database
GPG Key ID: A3ADB67A2CDB8B35
1 changed files with 4 additions and 4 deletions

View File

@ -389,7 +389,7 @@ class GPG(object):
for ring in [self.secring, self.pubring]: for ring in [self.secring, self.pubring]:
if ring and not os.path.isfile(ring): if ring and not os.path.isfile(ring):
with open(ring, 'a+') as ringfile: with open(ring, 'a+') as ringfile:
ringfile.write(" ") ringfile.write("")
ringfile.flush() ringfile.flush()
try: try:
assert _has_readwrite(ring), \ assert _has_readwrite(ring), \
@ -864,7 +864,7 @@ class GPG(object):
parms.setdefault('Key-Type', 'RSA') parms.setdefault('Key-Type', 'RSA')
parms.setdefault('Key-Length', 4096) parms.setdefault('Key-Length', 4096)
parms.setdefault('Name-Real', "Autogenerated Key") parms.setdefault('Name-Real', "Autogenerated Key")
parms.setdefault('Name-Comment', "Generated by gnupg.py") parms.setdefault('Name-Comment', "Generated by python-gnupg")
try: try:
logname = os.environ['LOGNAME'] logname = os.environ['LOGNAME']
except KeyError: except KeyError:
@ -875,8 +875,8 @@ class GPG(object):
out = "Key-Type: %s\n" % parms.pop('Key-Type') out = "Key-Type: %s\n" % parms.pop('Key-Type')
for key, val in list(parms.items()): for key, val in list(parms.items()):
out += "%s: %s\n" % (key, val) out += "%s: %s\n" % (key, val)
out += "%%pubring %s.pub\n" % self.pubring out += "%%pubring %s\n" % self.pubring
out += "%%secring %s.pub\n" % self.secring out += "%%secring %s\n" % self.secring
out += "%commit\n" out += "%commit\n"
return out return out