diff options
| author | Lars Wirzenius <liw@liw.fi> | 2012-11-24 16:17:11 +0000 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2012-11-24 16:17:11 +0000 |
| commit | c5bed37ce438a4d5d12a0a0f099261cb103c5fa0 (patch) | |
| tree | 141590cca7ed5f677c0c2769467f04de4876e5d4 | |
| parent | b340e88a1317dfff27e07d1bd0d45a28cda08c9d (diff) | |
| download | obnam-c5bed37ce438a4d5d12a0a0f099261cb103c5fa0.tar.gz | |
Remove --fsck-skip-b-trees, add --fsck-skip-shared-b-trees
| -rw-r--r-- | obnamlib/plugins/fsck_plugin.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/obnamlib/plugins/fsck_plugin.py b/obnamlib/plugins/fsck_plugin.py index 083b7190..072a5c13 100644 --- a/obnamlib/plugins/fsck_plugin.py +++ b/obnamlib/plugins/fsck_plugin.py @@ -214,9 +214,7 @@ class CheckClientlist(WorkItem): def do(self): logging.debug('Checking clientlist') clients = self.repo.clientlist.list_clients() - skip_client_trees = (self.settings['fsck-skip-b-trees'] or - self.settings['fsck-skip-per-client-b-trees']) - if not skip_client_trees: + if not self.settings['fsck-skip-per-client-b-trees']: for client_name in clients: if client_name not in self.settings['fsck-ignore-client']: client_id = self.repo.clientlist.get_client_id(client_name) @@ -268,7 +266,7 @@ class CheckRepository(WorkItem): def do(self): logging.debug('Checking repository') - if not self.settings['fsck-skip-b-trees']: + if not self.settings['fsck-skip-shared-b-trees']: yield CheckBTree('clientlist') yield CheckBTree('chunklist') yield CheckBTree('chunksums') @@ -285,9 +283,6 @@ class FsckPlugin(obnamlib.ObnamPlugin): ['fsck-ignore-chunks'], 'ignore chunks when checking repository integrity (assume all ' 'chunks exist and are correct)') - self.app.settings.boolean( - ['fsck-skip-b-trees'], - 'skip B-tree integrity checking') self.app.settings.string_list( ['fsck-ignore-client'], 'do not check repository data for cient NAME', @@ -304,6 +299,9 @@ class FsckPlugin(obnamlib.ObnamPlugin): self.app.settings.boolean( ['fsck-skip-per-client-b-trees'], 'do not check per-client B-trees') + self.app.settings.boolean( + ['fsck-skip-shared-b-trees'], + 'do not check shared B-trees') def configure_ttystatus(self): self.app.ts.clear() |