Skip to content

Commit

Permalink
catch and print error if docopt cannot handle input; fixes #10
Browse files Browse the repository at this point in the history
  • Loading branch information
bast committed Jun 23, 2015
1 parent b3e9f89 commit da00829
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions update.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def gen_setup(config, relative_path):

s.append("\nsys.path.append('%s')" % os.path.join(relative_path, 'lib'))
s.append('from config import configure')
s.append('from docopt import docopt')
s.append('import docopt')

s.append('\n\noptions = """')
s.append('Usage:')
Expand All @@ -140,7 +140,12 @@ def gen_setup(config, relative_path):

s.append(gen_cmake_command(config))

s.append("\n\narguments = docopt(options, argv=None)")
s.append("\n\ntry:")
s.append(" arguments = docopt.docopt(options, argv=None)")
s.append("except docopt.DocoptExit:")
s.append(r" sys.stderr.write('ERROR: bad input to %s\n' % sys.argv[0])")
s.append(" sys.stderr.write(options)")
s.append(" sys.exit(-1)")
s.append("\nroot_directory = os.path.dirname(os.path.realpath(__file__))")
s.append("build_path = arguments['<builddir>']")
s.append("cmake_command = '%s %s' % (gen_cmake_command(options, arguments), root_directory)")
Expand Down

0 comments on commit da00829

Please sign in to comment.