From 3fbb704dae0bb19570d54c81d3df9e70cd2d08a9 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 17 Jun 2017 09:08:15 +0000 Subject: [PATCH] projects.py fix: --flavours arguments mutilated The argument to --flavours isn't correctly evaluated. It allows only one value Signed-off-by: Jan Lindemann --- scripts/projects.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/projects.py b/scripts/projects.py index 3b506488..2baf3dc5 100644 --- a/scripts/projects.py +++ b/scripts/projects.py @@ -271,15 +271,18 @@ def cmd_required_pkg(args_): parser.add_argument('module', nargs='*', help='Modules') parser.add_argument('--flavours', help='Dependency flavours', default='build') args=parser.parse_args(args_) - deps = get_modules_from_project_txt(args.module, 'pkg.required.jw', args.flavours.split(), + flavours = args.flavours.split() + debug("flavours = " + args.flavours) + deps = get_modules_from_project_txt(args.module, 'pkg.required.jw', flavours, scope = 2, add_self=True, names_only=True) subsecs = pkg_required_os_cascade() debug("subsecs = ", subsecs) required = [] for s in subsecs: - vals = collect_values(deps, 'pkg.required.' + s, args.flavours) - if vals: - required = required + vals + for f in flavours: + vals = collect_values(deps, 'pkg.required.' + s, f) + if vals: + required = required + vals # TODO: add all not in build tree as -devel r = '' for m in required: