janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

projects.py fix: --flavours arguments mutilated

Browse source 
The argument to --flavours isn't correctly evaluated. It allows only one value

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-06-17 09:08:15 +00:00
commit 3fbb704dae
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scripts/projects.py
View file

@ -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: