mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4548 from ThomasWaldmann/expand-glob-archives 

enable placeholder usage in --glob-archives, fixes #4495
This commit is contained in:
TW 2019-05-11 21:29:36 +02:00 committed by GitHub
parent fe2e9d77e2 cc41e36405
commit 3a87e02fbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/borg/archiver.py
View File

@ -47,7 +47,7 @@ try:
from .helpers import EXIT_SUCCESS, EXIT_WARNING, EXIT_ERROR from .helpers import EXIT_SUCCESS, EXIT_WARNING, EXIT_ERROR
from .helpers import Error, NoManifestError, set_ec from .helpers import Error, NoManifestError, set_ec
from .helpers import positive_int_validator, location_validator, archivename_validator, ChunkerParams, Location from .helpers import positive_int_validator, location_validator, archivename_validator, ChunkerParams, Location
from .helpers import PrefixSpec, SortBySpec, FilesCacheMode from .helpers import PrefixSpec, GlobSpec, SortBySpec, FilesCacheMode
from .helpers import BaseFormatter, ItemFormatter, ArchiveFormatter from .helpers import BaseFormatter, ItemFormatter, ArchiveFormatter
from .helpers import format_timedelta, format_file_size, parse_file_size, format_archive from .helpers import format_timedelta, format_file_size, parse_file_size, format_archive
from .helpers import safe_encode, remove_surrogates, bin_to_hex, prepare_dump_dict from .helpers import safe_encode, remove_surrogates, bin_to_hex, prepare_dump_dict
@ -2180,8 +2180,8 @@ class Archiver:
# don't backup the other home directories # don't backup the other home directories
- /home/*\n\n''') - /home/*\n\n''')
helptext['placeholders'] = textwrap.dedent(''' helptext['placeholders'] = textwrap.dedent('''
Repository (or Archive) URLs, ``--prefix`` and ``--remote-path`` values support these Repository (or Archive) URLs, ``--prefix``, ``--glob-archives`` and ``--remote-path``
placeholders: values support these placeholders:
{hostname} {hostname}
The (short) hostname of the machine. The (short) hostname of the machine.
@ -2568,7 +2568,8 @@ class Archiver:
group = filters_group.add_mutually_exclusive_group() group = filters_group.add_mutually_exclusive_group()
group.add_argument('-P', '--prefix', metavar='PREFIX', dest='prefix', type=PrefixSpec, default='', group.add_argument('-P', '--prefix', metavar='PREFIX', dest='prefix', type=PrefixSpec, default='',
help='only consider archive names starting with this prefix.') help='only consider archive names starting with this prefix.')
group.add_argument('-a', '--glob-archives', metavar='GLOB', dest='glob_archives', default=None, group.add_argument('-a', '--glob-archives', metavar='GLOB', dest='glob_archives',
type=GlobSpec, default=None,
help='only consider archive names matching the glob. ' help='only consider archive names matching the glob. '
'sh: rules apply, see "borg help patterns". ' 'sh: rules apply, see "borg help patterns". '
'``--prefix`` and ``--glob-archives`` are mutually exclusive.') '``--prefix`` and ``--glob-archives`` are mutually exclusive.')

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

@ -225,6 +225,8 @@ def replace_placeholders(text):
PrefixSpec = replace_placeholders PrefixSpec = replace_placeholders
GlobSpec = replace_placeholders
def SortBySpec(text): def SortBySpec(text):
from .manifest import AI_HUMAN_SORT_KEYS from .manifest import AI_HUMAN_SORT_KEYS