diff options
Diffstat (limited to 'rtemstoolkit/check.py')
| -rw-r--r-- | rtemstoolkit/check.py | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/rtemstoolkit/check.py b/rtemstoolkit/check.py index 19d4dfa..cbec3a3 100644 --- a/rtemstoolkit/check.py +++ b/rtemstoolkit/check.py @@ -1,6 +1,6 @@ # # RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2010-2014 Chris Johns (chrisj@rtems.org) +# Copyright 2010-2016 Chris Johns (chrisj@rtems.org) # All rights reserved. # # This file is part of the RTEMS Tools package in 'rtems-tools'. @@ -32,14 +32,28 @@ # Check the defaults for a specific host. # +from __future__ import print_function + import os -import error -import execute -import log -import options -import path -import version +# +# Support to handle use in a package and as a unit test. +# If there is a better way to let us know. +# +try: + from . import error + from . import execute + from . import log + from . import options + from . import path + from . import version +except (ValueError, SystemError): + import error + import execute + import log + import options + import path + import version def _check_none(_opts, macro, value, constraint): return True @@ -117,7 +131,7 @@ def host_setup(opts): sane = True - for d in opts.defaults.keys(): + for d in list(opts.defaults.keys()): try: (test, constraint, value) = opts.defaults.get(d) except: @@ -152,7 +166,8 @@ def check_dir(label, path): def run(): import sys try: - _opts = options.load(args = sys.argv) + _opts = options.command_line(argv = sys.argv) + options.load(_opts) log.notice('RTEMS Source Builder - Check, v%s' % (version.str())) if host_setup(_opts): print('Environment is ok') |