From d0adb0047f1757bcc9051f712c6112013f06c3eb Mon Sep 17 00:00:00 2001 From: Nicolas Wavrant Date: Wed, 23 Oct 2024 15:39:26 +0900 Subject: [PATCH] fixup! repozo: support incremental recover --- src/ZODB/scripts/repozo.py | 3 ++- src/ZODB/scripts/tests/test_repozo.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ZODB/scripts/repozo.py b/src/ZODB/scripts/repozo.py index 530a0f143..cadf81432 100755 --- a/src/ZODB/scripts/repozo.py +++ b/src/ZODB/scripts/repozo.py @@ -818,7 +818,8 @@ def do_recover(options): else: raise NoFiles('No files in repository') - if options.full or options.output is None or not os.path.exists(options.output): + if (options.full or options.output is None + or not os.path.exists(options.output)): do_full_recover(options, repofiles) else: do_incremental_recover(options, repofiles) diff --git a/src/ZODB/scripts/tests/test_repozo.py b/src/ZODB/scripts/tests/test_repozo.py index 773773ead..fca707327 100644 --- a/src/ZODB/scripts/tests/test_repozo.py +++ b/src/ZODB/scripts/tests/test_repozo.py @@ -1068,7 +1068,9 @@ def test_w_incr_recover_from_incr_backup(self): '/backup/2010-05-14-04-05-06.deltafs 3 6 2bb225f0ba9a58930757a868ed57d9a3\n' # noqa: E501 line too long '/backup/2010-05-14-06-07-08.deltafs 6 9 defb99e69a9f1f6e06f15006b1f166ae\n' # noqa: E501 line too long '/backup/2010-05-14-08-09-10.deltafs 9 12 45054f47ac3305a2a33e9bcceadff712\n') # noqa: E501 line too long - os.unlink(os.path.join(self._repository_directory, '2010-05-14-04-05-06.deltafs')) + os.unlink( + os.path.join(self._repository_directory, + '2010-05-14-04-05-06.deltafs')) self._callFUT(options) self.assertNotIn('falling back to a full recover.', sys.stderr.getvalue())