mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 01:37:20 +00:00
Code Issues Releases Wiki Activity

remove ARCHIVE_KEYS duplication

Browse source 
also: get key set in sync, obviously we have "recreate_partial_chunks"
in ArchiveItem still.
This commit is contained in:
Thomas Waldmann 2019-02-23 10:09:40 +01:00
parent 1a2691c6e4
commit fc30a0765b
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/borg/constants.py
View file

@ -10,7 +10,7 @@
# this set must be kept complete, otherwise rebuild_manifest might malfunction: # this set must be kept complete, otherwise rebuild_manifest might malfunction:
ARCHIVE_KEYS = frozenset(['version', 'name', 'items', 'cmdline', 'hostname', 'username', 'time', 'time_end', ARCHIVE_KEYS = frozenset(['version', 'name', 'items', 'cmdline', 'hostname', 'username', 'time', 'time_end',
'comment', 'chunker_params', 'comment', 'chunker_params',
'recreate_cmdline', 'recreate_source_id', 'recreate_args']) 'recreate_cmdline', 'recreate_source_id', 'recreate_args', 'recreate_partial_chunks',])
# this is the set of keys that are always present in archives: # this is the set of keys that are always present in archives:
REQUIRED_ARCHIVE_KEYS = frozenset(['version', 'name', 'items', 'cmdline', 'time', ]) REQUIRED_ARCHIVE_KEYS = frozenset(['version', 'name', 'items', 'cmdline', 'time', ])

7
src/borg/item.pyx
View file

@ -1,7 +1,7 @@
import stat import stat
from collections import namedtuple from collections import namedtuple
from .constants import ITEM_KEYS from .constants import ITEM_KEYS, ARCHIVE_KEYS
from .helpers import safe_encode, safe_decode from .helpers import safe_encode, safe_decode
from .helpers import bigint_to_int, int_to_bigint from .helpers import bigint_to_int, int_to_bigint
from .helpers import StableDict from .helpers import StableDict
@ -349,10 +349,7 @@ class ArchiveItem(PropDict):
If a ArchiveItem shall be serialized, give as_dict() method output to msgpack packer. If a ArchiveItem shall be serialized, give as_dict() method output to msgpack packer.
""" """
VALID_KEYS = {'version', 'name', 'items', 'cmdline', 'hostname', 'username', 'time', 'time_end', VALID_KEYS = ARCHIVE_KEYS # str-typed keys
'comment', 'chunker_params',
'recreate_cmdline', 'recreate_source_id', 'recreate_args', 'recreate_partial_chunks',
} # str-typed keys
__slots__ = ("_dict", ) # avoid setting attributes not supported by properties __slots__ = ("_dict", ) # avoid setting attributes not supported by properties