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

Merge pull request #3674 from ThomasWaldmann/cache-config-validation 

borg config --cache: allow validated access to previous_location
This commit is contained in:
TW 2018-03-10 15:51:05 +01:00 committed by GitHub
parent 646c0ea117 810986f0f5
commit b812472f36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/borg/archiver.py
View File

@ -45,7 +45,7 @@ from .crypto.key import key_creator, key_argument_names, tam_required_file, tam_
from .crypto.keymanager import KeyManager from .crypto.keymanager import KeyManager
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 from .helpers import positive_int_validator, location_validator, archivename_validator, ChunkerParams, Location
from .helpers import PrefixSpec, SortBySpec, FilesCacheMode from .helpers import PrefixSpec, 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
@ -1559,8 +1559,10 @@ class Archiver:
def cache_validate(section, name, value=None, check_value=True): def cache_validate(section, name, value=None, check_value=True):
if section not in ['cache', ]: if section not in ['cache', ]:
raise ValueError('Invalid section') raise ValueError('Invalid section')
# I looked at the cache config and did not see anything a user would want to edit, if name in ['previous_location', ]:
# so, for now, raise for any key name if check_value:
Location(value)
else:
raise ValueError('Invalid name') raise ValueError('Invalid name')
try: try: