Merge remote-tracking branch 'kali/feature/more_debug_info' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 2 Aug 2013 13:34:46 +0000 (10:34 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 2 Aug 2013 13:34:46 +0000 (10:34 -0300)
.gitignore [new file with mode: 0644]
src/leap/keymanager/openpgp.py

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..b0f9a13
--- /dev/null
@@ -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~
index d19bb2b..9d404cb 100644 (file)
@@ -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))