Przeglądaj źródła

Merge pull request #6543 from ThomasWaldmann/fix-progress-archivename-1.2

escape % chars in archive name, fixes #6500
TW 3 lat temu
rodzic
commit
aa55aef2b9
1 zmienionych plików z 3 dodań i 1 usunięć
  1. 3 1
      src/borg/archive.py

+ 3 - 1
src/borg/archive.py

@@ -670,8 +670,10 @@ Utilization of max. archive size: {csize_max:.0%}
             archive_index = ChunkIndex()
             sync = CacheSynchronizer(archive_index)
             add(self.id)
+            # we must escape any % char in the archive name, because we use it in a format string, see #6500
+            arch_name_escd = self.name.replace('%', '%%')
             pi = ProgressIndicatorPercent(total=len(self.metadata.items),
-                                          msg='Calculating statistics for archive %s ... %%3d%%%%' % self.name,
+                                          msg='Calculating statistics for archive %s ... %%3.0f%%%%' % arch_name_escd,
                                           msgid='archive.calc_stats')
             for id, chunk in zip(self.metadata.items, self.repository.get_many(self.metadata.items)):
                 pi.show(increase=1)