upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-05-28 04:03:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #7081 from ThomasWaldmann/fix-transfer-chunker-params

Browse source 
transfer/upgrade: fix borg < 1.2 chunker_params, fixes #7079
This commit is contained in:
TW 2022-10-11 20:37:56 +02:00 committed by GitHub
commit a74bcb786d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/borg/upgrade.py
View file

@ -1,6 +1,6 @@
from struct import Struct
from .constants import REQUIRED_ITEM_KEYS
from .constants import REQUIRED_ITEM_KEYS, CH_BUZHASH
from .compress import ZLIB, ZLIB_legacy, ObfuscateSize
from .helpers import HardLinkManager
from .item import Item
@ -143,6 +143,10 @@ class UpgraderFrom12To20:
for attr in ("cmdline", "hostname", "username", "comment", "chunker_params", "recreate_cmdline"):
if hasattr(metadata, attr):
new_metadata[attr] = getattr(metadata, attr)
if chunker_params := new_metadata.get("chunker_params"):
if len(chunker_params) == 4 and isinstance(chunker_params[0], int):
# this is a borg < 1.2 chunker_params tuple, no chunker algo specified, but we only had buzhash:
new_metadata["chunker_params"] = (CH_BUZHASH,) + chunker_params
# old borg used UTC timestamps, but did not have the explicit tz offset in them.
for attr in ("time", "time_end"):
if hasattr(metadata, attr):