summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2015-08-29 12:53:19 +0300
committerLars Wirzenius <liw@liw.fi>2015-08-29 12:53:19 +0300
commit80e2292c34f35fe2222599f85698d4d71e1c3281 (patch)
tree73778c418a43e0597979e4bbb42bf0b5c20234bd
parentfe4a8d0d2c8410015696143b3317e13b221a9bc2 (diff)
downloadobnam-80e2292c34f35fe2222599f85698d4d71e1c3281.tar.gz
Let logging functions do string formatting
-rw-r--r--obnamlib/plugins/encryption_plugin.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/obnamlib/plugins/encryption_plugin.py b/obnamlib/plugins/encryption_plugin.py
index 2ff62a69..a71430de 100644
--- a/obnamlib/plugins/encryption_plugin.py
+++ b/obnamlib/plugins/encryption_plugin.py
@@ -162,12 +162,13 @@ class EncryptionPlugin(obnamlib.ObnamPlugin):
def remove_from_userkeys(self, repo, toplevel, keyid):
userkeys = self.read_keyring(repo, toplevel)
if keyid in userkeys:
- logging.debug('removing key %s from %s' % (keyid, toplevel))
+ logging.debug('removing key %s from %s', keyid, toplevel)
userkeys.remove(keyid)
self.write_keyring(repo, toplevel, userkeys)
else:
- logging.debug('unable to remove key %s from %s (not there)' %
- (keyid, toplevel))
+ logging.debug(
+ 'unable to remove key %s from %s (not there)',
+ keyid, toplevel)
def rewrite_symmetric_key(self, repo, toplevel):
symmetric_key = self.get_symmetric_key(repo, toplevel)
@@ -284,7 +285,7 @@ class EncryptionPlugin(obnamlib.ObnamPlugin):
repo = self.app.get_repository_object()
repo.lock_client_list()
for client_name in args:
- logging.info('removing client %s' % client_name)
+ logging.info('removing client %s', client_name)
repo.remove_client(client_name)
repo.commit_client_list()
repo.unlock_client_list()