aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2015-07-22 15:10:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-27 12:28:12 +0100
commit899288a1b255052a6ee0f97d42f8c4f0ec3c3140 (patch)
tree249e5f8fbb6057ce1b0300488b48c3ef918a8c6e
parent5753f20acc31d4d8d93069e3daccce1fad27b7ac (diff)
downloadopenembedded-core-contrib-899288a1b255052a6ee0f97d42f8c4f0ec3c3140.tar.gz
openembedded-core-contrib-899288a1b255052a6ee0f97d42f8c4f0ec3c3140.tar.bz2
openembedded-core-contrib-899288a1b255052a6ee0f97d42f8c4f0ec3c3140.zip
recipetool: parse global args early
This separates the argument parsing into two steps, which lets us apply global settings like enabling debugging before the plugins load, so we can see the paths where plugins are being loaded. Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rwxr-xr-xscripts/recipetool24
1 files changed, 16 insertions, 8 deletions
diff --git a/scripts/recipetool b/scripts/recipetool
index 37c2dd31f49..87fb35ed72a 100755
--- a/scripts/recipetool
+++ b/scripts/recipetool
@@ -46,12 +46,25 @@ def main():
sys.exit(1)
parser = argparse.ArgumentParser(description="OpenEmbedded recipe tool",
+ add_help=False,
epilog="Use %(prog)s <subcommand> --help to get help on a specific command")
parser.add_argument('-d', '--debug', help='Enable debug output', action='store_true')
parser.add_argument('-q', '--quiet', help='Print only errors', action='store_true')
parser.add_argument('--color', choices=['auto', 'always', 'never'], default='auto', help='Colorize output (where %(metavar)s is %(choices)s)', metavar='COLOR')
+
+ global_args, unparsed_args = parser.parse_known_args()
+
+ # Help is added here rather than via add_help=True, as we don't want it to
+ # be handled by parse_known_args()
+ parser.add_argument('-h', '--help', action='help', default=argparse.SUPPRESS,
+ help='show this help message and exit')
subparsers = parser.add_subparsers(title='subcommands', metavar='<subcommand>')
+ if global_args.debug:
+ logger.setLevel(logging.DEBUG)
+ elif global_args.quiet:
+ logger.setLevel(logging.ERROR)
+
import scriptpath
bitbakepath = scriptpath.add_bitbake_lib_path()
if not bitbakepath:
@@ -59,6 +72,8 @@ def main():
sys.exit(1)
logger.debug('Found bitbake path: %s' % bitbakepath)
+ scriptutils.logger_setup_color(logger, global_args.color)
+
tinfoil = tinfoil_init(False)
for path in ([scripts_path] +
tinfoil.config_data.getVar('BBPATH', True).split(':')):
@@ -77,14 +92,7 @@ def main():
logger.error("No commands registered - missing plugins?")
sys.exit(1)
- args = parser.parse_args()
-
- if args.debug:
- logger.setLevel(logging.DEBUG)
- elif args.quiet:
- logger.setLevel(logging.ERROR)
-
- scriptutils.logger_setup_color(logger, args.color)
+ args = parser.parse_args(unparsed_args, namespace=global_args)
try:
if getattr(args, 'parserecipes', False):