2
0
Эх сурвалжийг харах

Merge pull request #6619 from ThomasWaldmann/invalid-repo-msg-master

better error msg for defect or unsupported repo configs, fixes #6566
TW 3 жил өмнө
parent
commit
299196ebcb

+ 5 - 2
src/borg/repository.py

@@ -446,11 +446,14 @@ class Repository:
             raise self.InvalidRepository(self.path)
             raise self.InvalidRepository(self.path)
         if 'repository' not in self.config.sections():
         if 'repository' not in self.config.sections():
             self.close()
             self.close()
-            raise self.InvalidRepository(path)
+            raise self.InvalidRepositoryConfig(path, 'no repository section found')
         self.version = self.config.getint('repository', 'version')
         self.version = self.config.getint('repository', 'version')
         if self.version not in (2, ):  # for now, only work on new repos
         if self.version not in (2, ):  # for now, only work on new repos
             self.close()
             self.close()
-            raise self.InvalidRepository(path)
+            raise self.InvalidRepositoryConfig(
+                path,
+                'repository version %d is not supported by this borg version' % self.version
+            )
         self.max_segment_size = parse_file_size(self.config.get('repository', 'max_segment_size'))
         self.max_segment_size = parse_file_size(self.config.get('repository', 'max_segment_size'))
         if self.max_segment_size >= MAX_SEGMENT_SIZE_LIMIT:
         if self.max_segment_size >= MAX_SEGMENT_SIZE_LIMIT:
             self.close()
             self.close()