From 385ba008258f074b8b0cf528d833beaf0543c2e1 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Thu, 5 Jan 2017 18:25:25 -0200 Subject: [bug] remove key generation event from regenerate_key The KEYMANAGER_FINISHED_KEY_GENERATION event is used to send a welcome mail to the users, which was causing a new welcome mail when regenerating a key. We removed the event from regenerate_key method. We should implement a KEYMANAGER_FINISHED_KEY_REGENERATION event when it's needed. --- src/leap/bitmask/keymanager/__init__.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/leap/bitmask/keymanager/__init__.py b/src/leap/bitmask/keymanager/__init__.py index 2014524f..b2cf1c99 100644 --- a/src/leap/bitmask/keymanager/__init__.py +++ b/src/leap/bitmask/keymanager/__init__.py @@ -370,17 +370,10 @@ class KeyManager(object): :rtype: Deferred """ - def signal_finished(key): - emit_async( - catalog.KEYMANAGER_FINISHED_KEY_GENERATION, self._address) - return key self.log.info('Regenerating key for %s.' % self._address) - emit_async(catalog.KEYMANAGER_STARTED_KEY_GENERATION, self._address) new_key = yield self._openpgp.regenerate_key(self._address) yield self._openpgp.reset_all_keys_sign_used() - emit_async( - catalog.KEYMANAGER_FINISHED_KEY_GENERATION, self._address) defer.returnValue(new_key) -- cgit v1.2.3