summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2012-12-18 18:15:11 +0000
committerLars Wirzenius <liw@liw.fi>2012-12-18 18:15:11 +0000
commit52bb9b04dd7c8aaf6b7e049f0aa6ad7b11c3539d (patch)
tree96dd0eddd788d2c80df7b064bf38b003d5c4087d
parent638afdc5842fda1a00f773f2d342874b72508f5f (diff)
downloadobnam-52bb9b04dd7c8aaf6b7e049f0aa6ad7b11c3539d.tar.gz
Progress reporting during removal of old roots
-rw-r--r--NEWS5
-rw-r--r--obnamlib/plugins/backup_plugin.py8
2 files changed, 10 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 330ca10d..e4371b48 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,11 @@ Obnam NEWS
This file summarizes changes between releases of Obnam.
+Version X.Y, released UNRELEASED
+--------------------------------
+
+* Even more detailed progress reporting during a backup.
+
Version 1.3, released 2012-12-16
--------------------------------
diff --git a/obnamlib/plugins/backup_plugin.py b/obnamlib/plugins/backup_plugin.py
index 479df272..57363afe 100644
--- a/obnamlib/plugins/backup_plugin.py
+++ b/obnamlib/plugins/backup_plugin.py
@@ -376,9 +376,7 @@ class BackupPlugin(obnamlib.ObnamPlugin):
absroots.append(self.fs.abspath('.'))
if not self.pretend:
- # This only makes sense for the first generation.
- if len(self.repo.list_generations()) > 1:
- self.remove_old_roots(absroots)
+ self.remove_old_roots(absroots)
self.checkpoints = []
self.last_checkpoint = 0
@@ -753,9 +751,13 @@ class BackupPlugin(obnamlib.ObnamPlugin):
helper(pathname)
else:
tracing.trace('is extra and removed: %s' % dirname)
+ self.what('removing %s from new generation' % dirname)
self.repo.remove(dirname)
+ self.what(msg)
assert not self.pretend
+ msg = 'removing old backup roots from new generation'
+ self.what(msg)
tracing.trace('new_roots: %s' % repr(new_roots))
gen_id = self.repo.new_generation
helper('/')