Merge pull request #6544 from ThomasWaldmann/fix-progress-archivename-master

escape % chars in archive name, fixes #6500
This commit is contained in:
TW 2022-04-07 20:22:20 +02:00 committed by GitHub
commit 1e213e93a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions

View File

@ -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)