diff --git a/src/borg/archiver.py b/src/borg/archiver.py index 252faf502..7f90777f2 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -171,7 +171,7 @@ def with_repository(fake=False, invert_fake=False, create=False, lock=True, do_files=getattr(args, 'cache_files', False), ignore_inode=getattr(args, 'ignore_inode', False), progress=getattr(args, 'progress', False), lock_wait=self.lock_wait, - cache_mode=getattr(args, 'files_cache_mode', DEFAULT_FILES_CACHE_MODE)) as cache_: + cache_mode=getattr(args, 'files_cache_mode', FILES_CACHE_MODE_DISABLED)) as cache_: return method(self, args, repository=repository, cache=cache_, **kwargs) else: return method(self, args, repository=repository, **kwargs) @@ -3623,8 +3623,8 @@ class Archiver: fs_group.add_argument('--ignore-inode', dest='ignore_inode', action='store_true', help='ignore inode data in the file metadata cache used to detect unchanged files.') fs_group.add_argument('--files-cache', metavar='MODE', dest='files_cache_mode', - type=FilesCacheMode, default=DEFAULT_FILES_CACHE_MODE_UI, - help='operate files cache in MODE. default: %s' % DEFAULT_FILES_CACHE_MODE_UI) + type=FilesCacheMode, default=FILES_CACHE_MODE_UI_DEFAULT, + help='operate files cache in MODE. default: %s' % FILES_CACHE_MODE_UI_DEFAULT) fs_group.add_argument('--read-special', dest='read_special', action='store_true', help='open and read block and char device files as well as FIFOs as if they were ' 'regular files. Also follows symlinks pointing to these kinds of files.') diff --git a/src/borg/cache.py b/src/borg/cache.py index 47d8d67ec..b4a27c2bb 100644 --- a/src/borg/cache.py +++ b/src/borg/cache.py @@ -12,7 +12,7 @@ logger = create_logger() files_cache_logger = create_logger('borg.debug.files_cache') -from .constants import CACHE_README, DEFAULT_FILES_CACHE_MODE +from .constants import CACHE_README, FILES_CACHE_MODE_DISABLED from .hashindex import ChunkIndex, ChunkIndexEntry, CacheSynchronizer from .helpers import Location from .helpers import Error @@ -371,7 +371,7 @@ class Cache: shutil.rmtree(path) def __new__(cls, repository, key, manifest, path=None, sync=True, do_files=False, warn_if_unencrypted=True, - progress=False, lock_wait=None, permit_adhoc_cache=False, cache_mode=DEFAULT_FILES_CACHE_MODE, + progress=False, lock_wait=None, permit_adhoc_cache=False, cache_mode=FILES_CACHE_MODE_DISABLED, ignore_inode=False): if not do_files and 'd' not in cache_mode: @@ -441,7 +441,7 @@ class LocalCache(CacheStatsMixin): """ def __init__(self, repository, key, manifest, path=None, sync=True, warn_if_unencrypted=True, - progress=False, lock_wait=None, cache_mode=DEFAULT_FILES_CACHE_MODE): + progress=False, lock_wait=None, cache_mode=FILES_CACHE_MODE_DISABLED): """ :param warn_if_unencrypted: print warning if accessing unknown unencrypted repository :param lock_wait: timeout for lock acquisition (int [s] or None [wait forever]) diff --git a/src/borg/constants.py b/src/borg/constants.py index adc2f21b5..637be9b59 100644 --- a/src/borg/constants.py +++ b/src/borg/constants.py @@ -72,8 +72,8 @@ CHUNKER_PARAMS = (CHUNK_MIN_EXP, CHUNK_MAX_EXP, HASH_MASK_BITS, HASH_WINDOW_SIZE ITEMS_CHUNKER_PARAMS = (15, 19, 17, HASH_WINDOW_SIZE) # operating mode of the files cache (for fast skipping of unchanged files) -DEFAULT_FILES_CACHE_MODE_UI = 'ctime,size,inode' # default for "borg create" command (CLI UI) -DEFAULT_FILES_CACHE_MODE = 'd' # most borg commands do not use the files cache at all (disable) +FILES_CACHE_MODE_UI_DEFAULT = 'ctime,size,inode' # default for "borg create" command (CLI UI) +FILES_CACHE_MODE_DISABLED = 'd' # most borg commands do not use the files cache at all (disable) # return codes returned by borg command # when borg is killed by signal N, rc = 128 + N