summaryrefslogtreecommitdiff
path: root/obnamlib/plugins/restore_plugin.py
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2015-08-29 12:34:41 +0300
committerLars Wirzenius <liw@liw.fi>2015-08-29 12:34:41 +0300
commitdbadf9092b2cd2d082e612cb31a3b0bdb92396da (patch)
tree9f5428e57ae63fee645fb2d4eb061f9a3954bc61 /obnamlib/plugins/restore_plugin.py
parent7dfc352166bd3418afa58b944eb0a71467b8b83e (diff)
downloadobnam-dbadf9092b2cd2d082e612cb31a3b0bdb92396da.tar.gz
Let logging.debug do string formatting itself
Diffstat (limited to 'obnamlib/plugins/restore_plugin.py')
-rw-r--r--obnamlib/plugins/restore_plugin.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/obnamlib/plugins/restore_plugin.py b/obnamlib/plugins/restore_plugin.py
index 71266b62..b10a7ac5 100644
--- a/obnamlib/plugins/restore_plugin.py
+++ b/obnamlib/plugins/restore_plugin.py
@@ -124,11 +124,11 @@ class RestorePlugin(obnamlib.ObnamPlugin):
self.app.settings.require('generation')
self.app.settings.require('to')
- logging.debug('restoring generation %s' %
- self.app.settings['generation'])
- logging.debug('restoring to %s' % self.app.settings['to'])
+ logging.debug(
+ 'restoring generation %s', self.app.settings['generation'])
+ logging.debug('restoring to %s', self.app.settings['to'])
- logging.debug('restoring what: %s' % repr(args))
+ logging.debug('restoring what: %s', repr(args))
if not args:
logging.debug('no args given, so restoring everything')
args = ['/']
@@ -239,7 +239,7 @@ class RestorePlugin(obnamlib.ObnamPlugin):
self.errors = True
def restore_dir(self, gen, root, metadata):
- logging.debug('restoring dir %s' % root)
+ logging.debug('restoring dir %s', root)
if self.write_ok:
if not self.fs.exists('./' + root):
self.fs.mkdir('./' + root)
@@ -247,13 +247,13 @@ class RestorePlugin(obnamlib.ObnamPlugin):
'after recursing through %s' % repr(root))
def restore_hardlink(self, filename, link, metadata):
- logging.debug('restoring hardlink %s to %s' % (filename, link))
+ logging.debug('restoring hardlink %s to %s', filename, link)
if self.write_ok:
self.fs.link('./' + link, './' + filename)
self.hardlinks.forget(metadata)
def restore_symlink(self, gen, filename, metadata):
- logging.debug('restoring symlink %s' % filename)
+ logging.debug('restoring symlink %s', filename)
def restore_first_link(self, gen, filename, metadata):
if stat.S_ISREG(metadata.st_mode):
@@ -271,7 +271,7 @@ class RestorePlugin(obnamlib.ObnamPlugin):
self.app.ts.notify(msg)
def restore_regular_file(self, gen, filename, metadata):
- logging.debug('restoring regular %s' % filename)
+ logging.debug('restoring regular %s', filename)
if self.write_ok:
f = self.fs.open('./' + filename, 'wb')
summer = hashlib.md5()
@@ -329,17 +329,17 @@ class RestorePlugin(obnamlib.ObnamPlugin):
pass
def restore_fifo(self, gen, filename, metadata):
- logging.debug('restoring fifo %s' % filename)
+ logging.debug('restoring fifo %s', filename)
if self.write_ok:
self.fs.mknod('./' + filename, metadata.st_mode)
def restore_socket(self, gen, filename, metadata):
- logging.debug('restoring socket %s' % filename)
+ logging.debug('restoring socket %s', filename)
if self.write_ok:
self.fs.mknod('./' + filename, metadata.st_mode)
def restore_device(self, gen, filename, metadata):
- logging.debug('restoring device %s' % filename)
+ logging.debug('restoring device %s', filename)
if self.write_ok:
self.fs.mknod('./' + filename, metadata.st_mode)