From d3e5623ce8fb5128e71595597d1ee56ae92896ca Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Thu, 24 Jan 2013 12:38:54 -0200
Subject: Fix GPGWrapper send_keys logging.
---
src/leap/soledad/__init__.py | 5 -----
src/leap/soledad/util.py | 7 +++----
2 files changed, 3 insertions(+), 9 deletions(-)
(limited to 'src/leap')
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
-
--
cgit v1.2.3