dxs/onionr
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added check for travis in gpg homedir

Browse source
This commit is contained in:
Kevin Froman 2018-01-20 12:23:01 -06:00
parent b1c0567c98
commit d0a93ef2de
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
onionr/core.py
View file

@ -38,7 +38,10 @@ class Core:
''' Generate the main PGP key for our client. Should not be done often. ''' Generate the main PGP key for our client. Should not be done often.
Uses own PGP home folder in the data/ directory. ''' Uses own PGP home folder in the data/ directory. '''
# Generate main pgp key # Generate main pgp key
gpg = gnupg.GPG(gnupghome='./data/pgp/') if os.getenv('TRAVIS') == 'true':
gpg = gnupg.GPG(homedir='./data/pgp/')
else:
gpg = gnupg.GPG(gnupghome='./data/pgp/')
input_data = gpg.gen_key_input(key_type="RSA", key_length=2048, name_real=myID, name_email='anon@onionr') input_data = gpg.gen_key_input(key_type="RSA", key_length=2048, name_real=myID, name_email='anon@onionr')
#input_data = gpg.gen_key_input(key_type="RSA", key_length=1024) #input_data = gpg.gen_key_input(key_type="RSA", key_length=1024)
key = gpg.gen_key(input_data) key = gpg.gen_key(input_data)

5
onionr/onionrutils.py
View file

@ -66,7 +66,10 @@ class OnionrUtils():
'''Export our PGP key if it exists''' '''Export our PGP key if it exists'''
if not os.path.exists(self.fingerprintFile): if not os.path.exists(self.fingerprintFile):
raise Exception("No fingerprint found, cannot export our PGP key.") raise Exception("No fingerprint found, cannot export our PGP key.")
gpg = gnupg.GPG(gnupghome='./data/pgp/') if os.getenv('TRAVIS') == 'true':
gpg = gnupg.GPG(homedir='./data/pgp/')
else:
gpg = gnupg.GPG(gnupghome='./data/pgp/')
with open(self.fingerprintFile,'r') as f: with open(self.fingerprintFile,'r') as f:
fingerprint = f.read() fingerprint = f.read()
ascii_armored_public_keys = gpg.export_keys(fingerprint) ascii_armored_public_keys = gpg.export_keys(fingerprint)