From a3c89a1f83c54cacf396247791d9c28ec3930646 Mon Sep 17 00:00:00 2001 From: Przemek Wirkus Date: Thu, 7 Jul 2016 14:40:41 +0100 Subject: [PATCH] Add mbed-ls version string API Add version prints in debug mode --- mbed_lstools/main.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/mbed_lstools/main.py b/mbed_lstools/main.py index d1ca52d..41d7b26 100644 --- a/mbed_lstools/main.py +++ b/mbed_lstools/main.py @@ -149,11 +149,16 @@ def cmd_parser_setup(): def mbedls_main(): """! Function used to drive CLI (command line interface) application - @return Function exits with success code - @details Function exits back to command line with ERRORLEVEL """ + + def get_mbedls_version(): + """! Get mbed-ls Python module version string """ + import pkg_resources # part of setuptools + version = pkg_resources.require("mbed-ls")[0].version + return version + (opts, args) = cmd_parser_setup() mbeds = create() @@ -162,6 +167,7 @@ def mbedls_main(): sys.exit(-1) mbeds.DEBUG_FLAG = opts.debug + mbeds.debug(__name__, "mbed-ls ver. " + get_mbedls_version()) if not opts.skip_retarget: mbeds.retarget() @@ -204,14 +210,11 @@ def mbedls_main(): print json.dumps(mbeds.list_platforms_ext(), indent=4, sort_keys=True) elif opts.version: - import pkg_resources # part of setuptools - version = pkg_resources.require("mbed-ls")[0].version - print version + print get_mbedls_version() else: print mbeds.get_string(border=not opts.simple, header=not opts.simple) - if mbeds.DEBUG_FLAG: - mbeds.debug(__name__, "Return code: %d" % mbeds.ERRORLEVEL_FLAG) + mbeds.debug(__name__, "Return code: %d" % mbeds.ERRORLEVEL_FLAG) sys.exit(mbeds.ERRORLEVEL_FLAG)