diff options
| author | drebs <drebs@leap.se> | 2013-01-24 12:38:54 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-24 12:38:54 -0200 |
| commit | d3e5623ce8fb5128e71595597d1ee56ae92896ca (patch) | |
| tree | 2c94c0aacfeb827e330a511ad55b0a3c03c38245 | |
| parent | e1494639f57cafddfd433c62adaa52a21f104e10 (diff) | |
Fix GPGWrapper send_keys logging.
| -rw-r--r-- | src/leap/soledad/__init__.py | 5 | ||||
| -rw-r--r-- | src/leap/soledad/util.py | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py index cbd4bb0d..c83627f0 100644 --- a/src/leap/soledad/__init__.py +++ b/src/leap/soledad/__init__.py @@ -46,11 +46,6 @@ class Soledad(object): # Management of secret for symmetric encryption #------------------------------------------------------------------------- - - #------------------------------------------------------------------------- - # Management of secret for symmetric encryption - #------------------------------------------------------------------------- - def _has_secret(self): """ Verify if secret for symmetric encryption exists on local encrypted diff --git a/src/leap/soledad/util.py b/src/leap/soledad/util.py index 319d28ab..4bc4d2c9 100644 --- a/src/leap/soledad/util.py +++ b/src/leap/soledad/util.py @@ -45,12 +45,11 @@ class GPGWrapper(gnupg.GPG): Send keys to a keyserver """ result = self.result_map['list'](self) - logger.debug('send_keys: %r', keyids) - data = _make_binary_stream("", self.encoding) + gnupg.logger.debug('send_keys: %r', keyids) + data = gnupg._make_binary_stream("", self.encoding) args = ['--keyserver', keyserver, '--send-keys'] args.extend(keyids) self._handle_io(args, data, result, binary=True) - logger.debug('send_keys result: %r', result.__dict__) + gnupg.logger.debug('send_keys result: %r', result.__dict__) data.close() return result - |