mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 18:28:42 +00:00
Code Issues Releases Wiki Activity

use --one-file-system (as "du" tool does) instead of --do-not-cross-mountpoints

Browse source 
the old name still works, but emits a deprecation warning suggesting the new name.

this is a followup to 4fd06e2634, which added "-x" (as seen in "du").
This commit is contained in:
Thomas Waldmann 2015-10-17 20:55:07 +02:00
parent 0e9c524266
commit fc78b44923
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
borg/archiver.py
View file

@ -146,7 +146,7 @@ def do_create(self, args):
self.print_verbose("%1s %s", status, path) self.print_verbose("%1s %s", status, path)
continue continue
path = os.path.normpath(path) path = os.path.normpath(path)
if args.dontcross: if args.one_file_system:
try: try:
restrict_dev = os.lstat(path).st_dev restrict_dev = os.lstat(path).st_dev
except OSError as e: except OSError as e:
@ -530,7 +530,9 @@ def preprocess_args(self, args):
('--daily', '--keep-daily', 'Warning: "--daily" has been deprecated. Use "--keep-daily" instead.'), ('--daily', '--keep-daily', 'Warning: "--daily" has been deprecated. Use "--keep-daily" instead.'),
('--weekly', '--keep-weekly', 'Warning: "--weekly" has been deprecated. Use "--keep-weekly" instead.'), ('--weekly', '--keep-weekly', 'Warning: "--weekly" has been deprecated. Use "--keep-weekly" instead.'),
('--monthly', '--keep-monthly', 'Warning: "--monthly" has been deprecated. Use "--keep-monthly" instead.'), ('--monthly', '--keep-monthly', 'Warning: "--monthly" has been deprecated. Use "--keep-monthly" instead.'),
('--yearly', '--keep-yearly', 'Warning: "--yearly" has been deprecated. Use "--keep-yearly" instead.') ('--yearly', '--keep-yearly', 'Warning: "--yearly" has been deprecated. Use "--keep-yearly" instead.'),
('--do-not-cross-mountpoints', '--one-file-system',
'Warning: "--do-no-cross-mountpoints" has been deprecated. Use "--one-file-system" instead.'),
] ]
if args and args[0] == 'verify': if args and args[0] == 'verify':
print('Warning: "borg verify" has been deprecated. Use "borg extract --dry-run" instead.') print('Warning: "borg verify" has been deprecated. Use "borg extract --dry-run" instead.')
@ -683,9 +685,9 @@ def build_parser(self, args=None, prog=None):
subparser.add_argument('-c', '--checkpoint-interval', dest='checkpoint_interval', subparser.add_argument('-c', '--checkpoint-interval', dest='checkpoint_interval',
type=int, default=300, metavar='SECONDS', type=int, default=300, metavar='SECONDS',
help='write checkpoint every SECONDS seconds (Default: 300)') help='write checkpoint every SECONDS seconds (Default: 300)')
subparser.add_argument('-x', '--do-not-cross-mountpoints', dest='dontcross', subparser.add_argument('-x', '--one-file-system', dest='one_file_system',
action='store_true', default=False, action='store_true', default=False,
help='do not cross mount points') help='stay in same file system, do not cross mount points')
subparser.add_argument('--numeric-owner', dest='numeric_owner', subparser.add_argument('--numeric-owner', dest='numeric_owner',
action='store_true', default=False, action='store_true', default=False,
help='only store numeric user and group identifiers') help='only store numeric user and group identifiers')