diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-02 10:34:46 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-02 10:34:46 -0300 |
| commit | 5a77f97b954f0286d3da7d227a6f4e130ab25f5f (patch) | |
| tree | 4a9b9b69175a1fb7aa22cb9c1555f1b75b2d5aaa | |
| parent | f2fefe6a5e58d81d5c2d85371c4a575603258a91 (diff) | |
| parent | bd817552f6410f2ecd54dbbc7a1116ff5dc1659e (diff) | |
Merge remote-tracking branch 'kali/feature/more_debug_info' into develop
| -rw-r--r-- | keymanager/.gitignore | 34 | ||||
| -rw-r--r-- | keymanager/src/leap/keymanager/openpgp.py | 11 |
2 files changed, 44 insertions, 1 deletions
diff --git a/keymanager/.gitignore b/keymanager/.gitignore new file mode 100644 index 0000000..b0f9a13 --- /dev/null +++ b/keymanager/.gitignore @@ -0,0 +1,34 @@ +*.swp +*.swo +*.pyc +*.log +*.*~ +.* +*_rc.py +ui_*.py +!.coveragerc +!.tx +bin/ +build/ +core +debian/python-leap-client/ +dist/ +docs/_build +docs/covhtml +include/ +lib/ +local/ +share/ +src/leap/util/reqs.txt +src/leap.egg-info/ +src/leap_client.egg-info +src/leap/_branding.py +src/leap/certs/*.pem +src/*.egg-info +src/pysqlcipher +pkg/osx/dist +pkg/osx/build +MANIFEST +_trial_temp* +config/* +CHANGELOG~ diff --git a/keymanager/src/leap/keymanager/openpgp.py b/keymanager/src/leap/keymanager/openpgp.py index d19bb2b..9d404cb 100644 --- a/keymanager/src/leap/keymanager/openpgp.py +++ b/keymanager/src/leap/keymanager/openpgp.py @@ -473,7 +473,7 @@ class OpenPGPScheme(EncryptionScheme): self.get_key(address) raise errors.KeyAlreadyExists(address) except errors.KeyNotFound: - pass + logger.debug('Key for %s not found' % (address,)) def _gen_key(gpg): params = gpg.gen_key_input( @@ -482,9 +482,18 @@ class OpenPGPScheme(EncryptionScheme): name_real=address, name_email=address, name_comment='Generated by LEAP Key Manager.') + logger.info("About to generate keys... This might take SOME time.") gpg.gen_key(params) + logger.info("Keys for %s have been successfully " + "generated." % (address,)) pubkeys = gpg.list_keys() + # assert for new key characteristics + + # XXX This exception is not properly catched by the soledad + # bootstrapping, so if we do not finish generating the keys + # we end with a blocked thread -- kali + leap_assert( len(pubkeys) is 1, # a unitary keyring! 'Keyring has wrong number of keys: %d.' % len(pubkeys)) |