Merge pull request #5016 from ThomasWaldmann/improve-repo-check-output-master

Improve repo check output (master)

src/borg/repository.py

@@ -1022,24 +1022,20 @@ class Repository:
                     report_error('Index object count mismatch.')
                     logger.error('committed index: %d objects', len(current_index))
                     logger.error('rebuilt index:   %d objects', len(self.index))
-
-                    line_format = '%-64s %-16s %-16s'
-                    not_found = '<not found>'
-                    logger.warning(line_format, 'ID', 'rebuilt index', 'committed index')
-                    for key, value in self.index.iteritems():
-                        current_value = current_index.get(key, not_found)
-                        if current_value != value:
-                            logger.warning(line_format, bin_to_hex(key), value, current_value)
-                    for key, current_value in current_index.iteritems():
-                        if key in self.index:
-                            continue
-                        value = self.index.get(key, not_found)
-                        if current_value != value:
-                            logger.warning(line_format, bin_to_hex(key), value, current_value)
-                elif current_index:
-                    for key, value in self.index.iteritems():
-                        if current_index.get(key, (-1, -1)) != value:
-                            report_error('Index mismatch for key {}. {} != {}'.format(key, value, current_index.get(key, (-1, -1))))
+                else:
+                    logger.info('Index object count match.')
+                line_format = 'ID: %-64s rebuilt index: %-16s committed index: %-16s'
+                not_found = '<not found>'
+                for key, value in self.index.iteritems():
+                    current_value = current_index.get(key, not_found)
+                    if current_value != value:
+                        logger.warning(line_format, bin_to_hex(key), value, current_value)
+                for key, current_value in current_index.iteritems():
+                    if key in self.index:
+                        continue
+                    value = self.index.get(key, not_found)
+                    if current_value != value:
+                        logger.warning(line_format, bin_to_hex(key), value, current_value)
             if repair:
                 self.write_index()
         self.rollback()