浏览代码

debug dump-repo-objs should not depend on a manifest obj

thus, we should not use the with_repository decorator to set up
the key as it uses Manifest.load() to set up the key.

if the Manifest is lost, that does not work.

but we can use some arbitrary object to set up the key, so just
do that.

(cherry picked from commit 2e1f2e84d7fcc706f00168a4a49b22604597654c)
Thomas Waldmann 7 年之前
父节点
当前提交
0874bcbbf1
共有 1 个文件被更改,包括 8 次插入2 次删除
  1. 8 2
      src/borg/archiver.py

+ 8 - 2
src/borg/archiver.py

@@ -1688,9 +1688,15 @@ class Archiver:
             json.dump(meta, fd, indent=4)
         return EXIT_SUCCESS
 
-    @with_repository(compatibility=Manifest.NO_OPERATION_CHECK)
-    def do_debug_dump_repo_objs(self, args, repository, manifest, key):
+    @with_repository(manifest=False)
+    def do_debug_dump_repo_objs(self, args, repository):
         """dump (decrypted, decompressed) repo objects"""
+        from .crypto.key import key_factory
+        # set up the key without depending on a manifest obj
+        ids = repository.list(limit=1, marker=None)
+        cdata = repository.get(ids[0])
+        key = key_factory(repository, cdata)
+
         marker = None
         i = 0
         while True: