Commit a4b247f0 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Merge branch 'devel-2.6'



* devel-2.6:
  ensure-dirs: Don't accept arguments
  ensure-dirs: Fix program name on usage screen
  cli: Fix small typo
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 29fbe62e fca74633
......@@ -734,7 +734,7 @@ SYNC_OPT = cli_option("--sync", dest="do_locking",
DRY_RUN_OPT = cli_option("--dry-run", default=False,
action="store_true",
help=("Do not execute the operation, just run the"
" check steps and verify it it could be"
" check steps and verify if it could be"
" executed"))
VERBOSE_OPT = cli_option("-v", "--verbose", default=False,
......
......@@ -229,7 +229,7 @@ def ParseOptions():
"""
program = os.path.basename(sys.argv[0])
parser = optparse.OptionParser(usage="%%prog [--full-run]",
parser = optparse.OptionParser(usage="%prog [--full-run]",
prog=program)
parser.add_option(cli.DEBUG_OPT)
parser.add_option(cli.VERBOSE_OPT)
......@@ -244,10 +244,14 @@ def Main():
"""Main routine.
"""
(opts, _) = ParseOptions()
(opts, args) = ParseOptions()
SetupLogging(opts)
if args:
logging.error("No arguments are expected")
return constants.EXIT_FAILURE
if opts.full_run:
logging.info("Running in full mode")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment