mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-26 07:53:58 +00:00
Code Issues Releases Wiki Activity

borg2 archive names and comments are always pure unicode

Browse source
This commit is contained in:
Thomas Waldmann 2023-01-08 20:11:01 +01:00
parent 8765e62bcd
commit 491f898612
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/borg/cache.py
View file

@ -863,7 +863,7 @@ def create_master_idx(chunk_idx):
)
archive_ids_to_names = get_archive_ids_to_names(archive_ids)
for archive_id, archive_name in archive_ids_to_names.items():
pi.show(info=[remove_surrogates(archive_name)])
pi.show(info=[remove_surrogates(archive_name)]) # legacy. borg2 always has pure unicode arch names.
if self.do_cache:
if archive_id in cached_ids:
archive_chunk_idx = read_archive_index(archive_id, archive_name)

6
src/borg/helpers/parseformat.py
View file

@ -717,7 +717,7 @@ def __init__(self, format, repository, manifest, key, *, json=False, iec=False):
self.call_keys = {
"hostname": partial(self.get_meta, "hostname", rs=True),
"username": partial(self.get_meta, "username", rs=True),
"comment": partial(self.get_meta, "comment", rs=True),
"comment": partial(self.get_meta, "comment", rs=False),
"end": self.get_ts_end,
"command_line": self.get_cmdline,
}
@ -738,8 +738,8 @@ def get_item_data(self, archive_info):
item_data.update(self.item_data)
item_data.update(
{
"name": remove_surrogates(archive_info.name),
"archive": remove_surrogates(archive_info.name),
"name": archive_info.name,
"archive": archive_info.name,
"id": bin_to_hex(archive_info.id),
"time": self.format_time(archive_info.ts),
"start": self.format_time(archive_info.ts),