mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-24 16:55:36 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4143 from step21/master

Browse source 
Fixed links to cachedir spec in docs and code, fixes #4140
This commit is contained in:
TW 2018-10-31 15:22:14 +01:00 committed by GitHub
commit 712a02c32b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/borg/archiver.py
View file

@ -2487,7 +2487,7 @@ def define_exclude_and_patterns(add_option, *, tag_files=False, strip_components
if tag_files: if tag_files:
add_option('--exclude-caches', dest='exclude_caches', action='store_true', add_option('--exclude-caches', dest='exclude_caches', action='store_true',
help='exclude directories that contain a CACHEDIR.TAG file ' help='exclude directories that contain a CACHEDIR.TAG file '
'(http://www.brynosaurus.com/cachedir/spec.html)') '(http://www.bford.info/cachedir/spec.html)')
add_option('--exclude-if-present', metavar='NAME', dest='exclude_if_present', add_option('--exclude-if-present', metavar='NAME', dest='exclude_if_present',
action='append', type=str, action='append', type=str,
help='exclude directories that are tagged by containing a filesystem object with ' help='exclude directories that are tagged by containing a filesystem object with '

4
src/borg/helpers/fs.py
View file

@ -66,7 +66,7 @@ def get_cache_dir():
fd.write(textwrap.dedent(""" fd.write(textwrap.dedent("""
# This file is a cache directory tag created by Borg. # This file is a cache directory tag created by Borg.
# For information about cache directory tags, see: # For information about cache directory tags, see:
# http://www.brynosaurus.com/cachedir/ # http://www.bford.info/cachedir/spec.html
""").encode('ascii')) """).encode('ascii'))
return cache_dir return cache_dir
@ -85,7 +85,7 @@ def dir_is_cachedir(path):
"""Determines whether the specified path is a cache directory (and """Determines whether the specified path is a cache directory (and
therefore should potentially be excluded from the backup) according to therefore should potentially be excluded from the backup) according to
the CACHEDIR.TAG protocol the CACHEDIR.TAG protocol
(http://www.brynosaurus.com/cachedir/spec.html). (http://www.bford.info/cachedir/spec.html).
""" """
tag_path = os.path.join(path, CACHE_TAG_NAME) tag_path = os.path.join(path, CACHE_TAG_NAME)