mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-10 06:03:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7891 from ThomasWaldmann/sort-by-aliases-1.2

Browse source 
--sort-by: support "archive" as alias of "name", fixes #7873 (1.2-maint)
This commit is contained in:
TW 2023-10-27 22:27:59 +02:00 • committed by GitHub
commit b83525cd4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/borg/helpers/manifest.py
View file

@ -28,7 +28,8 @@ class MandatoryFeatureUnsupported(Error):
ArchiveInfo = namedtuple('ArchiveInfo', 'name id ts')
AI_HUMAN_SORT_KEYS = ['timestamp'] + list(ArchiveInfo._fields)
# timestamp is a replacement for ts, archive is an alias for name (see SortBySpec)
AI_HUMAN_SORT_KEYS = ['timestamp', 'archive'] + list(ArchiveInfo._fields)
AI_HUMAN_SORT_KEYS.remove('ts')

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

@ -228,7 +228,7 @@ def SortBySpec(text):
for token in text.split(','):
if token not in AI_HUMAN_SORT_KEYS:
raise argparse.ArgumentTypeError('Invalid sort key: %s' % token)
return text.replace('timestamp', 'ts')
return text.replace('timestamp', 'ts').replace('archive', 'name')
def format_file_size(v, precision=2, sign=False, iec=False):