Commit so I can pull from trunk

This commit is contained in:
Kovid Goyal 2009-03-09 13:13:51 -07:00
parent 3ea6391996
commit 6bb4628828

View File

@ -127,10 +127,13 @@ def add_pipeline_options(parser, plumber):
rec = plumber.get_option_by_name(name) rec = plumber.get_option_by_name(name)
if rec.level < rec.HIGH: if rec.level < rec.HIGH:
option_recommendation_to_cli_option(add_option, rec) option_recommendation_to_cli_option(add_option, rec)
def option_parser():
return OptionParser(usage=USAGE)
def main(args=sys.argv): def main(args=sys.argv):
log = Log() log = Log()
parser = OptionParser(usage=USAGE) parser = option_parser()
if len(args) < 3: if len(args) < 3:
print_help(parser, log) print_help(parser, log)
return 1 return 1
@ -147,9 +150,9 @@ def main(args=sys.argv):
recommendations = [(n.dest, getattr(opts, n.dest)) \ recommendations = [(n.dest, getattr(opts, n.dest)) \
for n in parser.options_iter()] for n in parser.options_iter()]
plumber.merge_ui_recommendations(recommendations) plumber.merge_ui_recommendations(recommendations)
return 0 return 0
if __name__ == '__main__': if __name__ == '__main__':
sys.exit(main()) sys.exit(main())