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

Merge pull request #593 from anarcat/deambigp 

disambiguate -p versus -P
This commit is contained in:
TW 2016-01-24 14:53:08 +01:00
parent 777fc89d3f 22efee3d2e
commit de124aacd0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
borg/archiver.py
View File

@ -862,7 +862,7 @@ class Archiver:
subparser.add_argument('--last', dest='last', subparser.add_argument('--last', dest='last',
type=int, default=None, metavar='N', type=int, default=None, metavar='N',
help='only check last N archives (Default: all)') help='only check last N archives (Default: all)')
subparser.add_argument('-p', '--prefix', dest='prefix', type=str, subparser.add_argument('-P', '--prefix', dest='prefix', type=str,
help='only consider archive names starting with this prefix') help='only consider archive names starting with this prefix')
change_passphrase_epilog = textwrap.dedent(""" change_passphrase_epilog = textwrap.dedent("""
@ -1048,7 +1048,7 @@ class Archiver:
subparser.add_argument('--short', dest='short', subparser.add_argument('--short', dest='short',
action='store_true', default=False, action='store_true', default=False,
help='only print file/directory names, nothing else') help='only print file/directory names, nothing else')
subparser.add_argument('-p', '--prefix', dest='prefix', type=str, subparser.add_argument('-P', '--prefix', dest='prefix', type=str,
help='only consider archive names starting with this prefix') help='only consider archive names starting with this prefix')
subparser.add_argument('location', metavar='REPOSITORY_OR_ARCHIVE', nargs='?', default='', subparser.add_argument('location', metavar='REPOSITORY_OR_ARCHIVE', nargs='?', default='',
type=location_validator(), type=location_validator(),
@ -1120,7 +1120,7 @@ class Archiver:
"1m" is taken to mean "31d". The archives kept with this option do not "1m" is taken to mean "31d". The archives kept with this option do not
count towards the totals specified by any other options. count towards the totals specified by any other options.
If a prefix is set with -p, then only archives that start with the prefix are If a prefix is set with -P, then only archives that start with the prefix are
considered for deletion and only those archives count towards the totals considered for deletion and only those archives count towards the totals
specified by the rules. specified by the rules.
Otherwise, *all* archives in the repository are candidates for deletion! Otherwise, *all* archives in the repository are candidates for deletion!
@ -1148,7 +1148,7 @@ class Archiver:
help='number of monthly archives to keep') help='number of monthly archives to keep')
subparser.add_argument('-y', '--keep-yearly', dest='yearly', type=int, default=0, subparser.add_argument('-y', '--keep-yearly', dest='yearly', type=int, default=0,
help='number of yearly archives to keep') help='number of yearly archives to keep')
subparser.add_argument('-p', '--prefix', dest='prefix', type=str, subparser.add_argument('-P', '--prefix', dest='prefix', type=str,
help='only consider archive names starting with this prefix') help='only consider archive names starting with this prefix')
subparser.add_argument('--save-space', dest='save_space', action='store_true', subparser.add_argument('--save-space', dest='save_space', action='store_true',
default=False, default=False,