cleanup
This commit is contained in:
@ -31,6 +31,10 @@ class ZfsAuto(object):
|
|||||||
parser=self.get_parser()
|
parser=self.get_parser()
|
||||||
args = parser.parse_args(argv)
|
args = parser.parse_args(argv)
|
||||||
|
|
||||||
|
if args.help:
|
||||||
|
parser.print_help()
|
||||||
|
sys.exit(255)
|
||||||
|
|
||||||
if args.version:
|
if args.version:
|
||||||
print(self.HEADER)
|
print(self.HEADER)
|
||||||
sys.exit(255)
|
sys.exit(255)
|
||||||
@ -93,12 +97,11 @@ class ZfsAuto(object):
|
|||||||
self.verbose("Selecting dataset property : {}".format(self.property_name))
|
self.verbose("Selecting dataset property : {}".format(self.property_name))
|
||||||
self.verbose("Snapshot format : {}".format(self.snapshot_time_format))
|
self.verbose("Snapshot format : {}".format(self.snapshot_time_format))
|
||||||
|
|
||||||
|
|
||||||
return args
|
return args
|
||||||
|
|
||||||
def get_parser(self):
|
def get_parser(self):
|
||||||
|
|
||||||
parser = argparse.ArgumentParser(description=self.HEADER,
|
parser = argparse.ArgumentParser(description=self.HEADER, add_help=False,
|
||||||
epilog='Full manual at: https://github.com/psy0rz/zfs_autobackup')
|
epilog='Full manual at: https://github.com/psy0rz/zfs_autobackup')
|
||||||
|
|
||||||
#positional arguments
|
#positional arguments
|
||||||
@ -109,25 +112,26 @@ class ZfsAuto(object):
|
|||||||
help='Target ZFS filesystem (optional)')
|
help='Target ZFS filesystem (optional)')
|
||||||
|
|
||||||
# Basic options
|
# Basic options
|
||||||
parser.add_argument('--test', '--dry-run', '-n', action='store_true',
|
group=parser.add_argument_group("Basic options")
|
||||||
|
group.add_argument('--help', '-h', action='store_true', help='show help')
|
||||||
|
group.add_argument('--test', '--dry-run', '-n', action='store_true',
|
||||||
help='Dry run, dont change anything, just show what would be done (still does all read-only '
|
help='Dry run, dont change anything, just show what would be done (still does all read-only '
|
||||||
'operations)')
|
'operations)')
|
||||||
parser.add_argument('--verbose', '-v', action='store_true', help='verbose output')
|
group.add_argument('--verbose', '-v', action='store_true', help='verbose output')
|
||||||
parser.add_argument('--debug', '-d', action='store_true',
|
group.add_argument('--debug', '-d', action='store_true',
|
||||||
help='Show zfs commands that are executed, stops after an exception.')
|
help='Show zfs commands that are executed, stops after an exception.')
|
||||||
parser.add_argument('--debug-output', action='store_true',
|
group.add_argument('--debug-output', action='store_true',
|
||||||
help='Show zfs commands and their output/exit codes. (noisy)')
|
help='Show zfs commands and their output/exit codes. (noisy)')
|
||||||
parser.add_argument('--progress', action='store_true',
|
group.add_argument('--progress', action='store_true',
|
||||||
help='show zfs progress output. Enabled automaticly on ttys. (use --no-progress to disable)')
|
help='show zfs progress output. Enabled automaticly on ttys. (use --no-progress to disable)')
|
||||||
parser.add_argument('--no-progress', action='store_true',
|
group.add_argument('--no-progress', action='store_true',
|
||||||
help=argparse.SUPPRESS) # needed to workaround a zfs recv -v bug
|
help=argparse.SUPPRESS) # needed to workaround a zfs recv -v bug
|
||||||
parser.add_argument('--version', action='store_true',
|
group.add_argument('--version', action='store_true',
|
||||||
help='Show version.')
|
help='Show version.')
|
||||||
parser.add_argument('--strip-path', metavar='N', default=0, type=int,
|
group.add_argument('--strip-path', metavar='N', default=0, type=int,
|
||||||
help='Number of directories to strip from target path (use 1 when cloning zones between 2 '
|
help='Number of directories to strip from target path (use 1 when cloning zones between 2 '
|
||||||
'SmartOS machines)')
|
'SmartOS machines)')
|
||||||
|
|
||||||
|
|
||||||
# SSH options
|
# SSH options
|
||||||
group=parser.add_argument_group("SSH options")
|
group=parser.add_argument_group("SSH options")
|
||||||
group.add_argument('--ssh-config', metavar='CONFIG-FILE', default=None, help='Custom ssh client config')
|
group.add_argument('--ssh-config', metavar='CONFIG-FILE', default=None, help='Custom ssh client config')
|
||||||
@ -136,7 +140,6 @@ class ZfsAuto(object):
|
|||||||
group.add_argument('--ssh-target', metavar='USER@HOST', default=None,
|
group.add_argument('--ssh-target', metavar='USER@HOST', default=None,
|
||||||
help='Target host to push backup to.')
|
help='Target host to push backup to.')
|
||||||
|
|
||||||
|
|
||||||
group=parser.add_argument_group("String formatting options")
|
group=parser.add_argument_group("String formatting options")
|
||||||
group.add_argument('--property-format', metavar='FORMAT', default="autobackup:{}",
|
group.add_argument('--property-format', metavar='FORMAT', default="autobackup:{}",
|
||||||
help='Dataset selection string format. Default: %(default)s')
|
help='Dataset selection string format. Default: %(default)s')
|
||||||
@ -145,7 +148,6 @@ class ZfsAuto(object):
|
|||||||
group.add_argument('--hold-format', metavar='FORMAT', default="zfs_autobackup:{}",
|
group.add_argument('--hold-format', metavar='FORMAT', default="zfs_autobackup:{}",
|
||||||
help='ZFS hold string format. Default: %(default)s')
|
help='ZFS hold string format. Default: %(default)s')
|
||||||
|
|
||||||
|
|
||||||
group=parser.add_argument_group("Selection options")
|
group=parser.add_argument_group("Selection options")
|
||||||
group.add_argument('--ignore-replicated', action='store_true', help=argparse.SUPPRESS)
|
group.add_argument('--ignore-replicated', action='store_true', help=argparse.SUPPRESS)
|
||||||
group.add_argument('--exclude-unchanged', action='store_true',
|
group.add_argument('--exclude-unchanged', action='store_true',
|
||||||
|
|||||||
Reference in New Issue
Block a user