Because I can't remember which options are supposed to be uppercase and which are not,

rename all of them so we can use non-conflicting lowercase.  Manpage updates pending
This commit is contained in:
Michael DeHaan 2012-02-28 02:38:36 -05:00
parent de1d0011bc
commit ab17f6f44e
2 changed files with 5 additions and 5 deletions

View file

@ -37,10 +37,10 @@ def main(args):
parser = base_ans_parser() parser = base_ans_parser()
parser.usage = "ans-command [options] command-to-run" parser.usage = "ans-command [options] command-to-run"
parser.add_option('-1', '--one-line', dest='one_line', action='store_true', parser.add_option('-o', '--one-line', dest='one_line', action='store_true',
help="output results on one line to make grepping easier, however will \ help="output results on one line to make grepping easier, however will \
not remove newlines from command output") not remove newlines from command output")
parser.add_option('-o', '--output-dir', dest='output_dest', default=None, parser.add_option('-t', '--tree', dest='output_dest', default=None,
help="if specified, a directory name to save output to, one file per host") help="if specified, a directory name to save output to, one file per host")
options, args = parser.parse_args(args) options, args = parser.parse_args(args)

View file

@ -20,15 +20,15 @@ import constants as C
def base_ans_parser(): def base_ans_parser():
parser = OptionParser() parser = OptionParser()
parser.add_option("-H", "--host-list", dest="host_list", parser.add_option("-l", "--host-list", dest="host_list",
help="path to hosts list", default=C.DEFAULT_HOST_LIST) help="path to hosts list", default=C.DEFAULT_HOST_LIST)
parser.add_option("-L", "--library", dest="module_path", parser.add_option("-m", "--module-path", dest="module_path",
help="path to module library", default=C.DEFAULT_MODULE_PATH) help="path to module library", default=C.DEFAULT_MODULE_PATH)
parser.add_option('-u', '--user', default=C.DEFAULT_REMOTE_USER, parser.add_option('-u', '--user', default=C.DEFAULT_REMOTE_USER,
dest='remote_user', help='set the default username') dest='remote_user', help='set the default username')
parser.add_option("-p", "--pattern", dest="pattern", parser.add_option("-p", "--pattern", dest="pattern",
help="hostname pattern", default=C.DEFAULT_PATTERN) help="hostname pattern", default=C.DEFAULT_PATTERN)
parser.add_option("-P", "--askpass", default=False, action="store_true", parser.add_option("-k", "--askpass", default=False, action="store_true",
help="ask the user to input the ssh password for connecting") help="ask the user to input the ssh password for connecting")
parser.add_option('-f','--forks', dest='forks', default=C.DEFAULT_FORKS, type='int', parser.add_option('-f','--forks', dest='forks', default=C.DEFAULT_FORKS, type='int',
help='set the number of forks to start up') help='set the number of forks to start up')