janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-20 05:37:38 +01:00
Code Activity

projects.py: Fix recursion

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-01-26 15:20:48 +00:00
commit 69bcd617b2
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
scripts/projects.py
View file

@ -68,22 +68,23 @@ def get_value(name, section, key):
def add_modules_from_project_txt(buf, name, section, key, add_self, recursive, def add_modules_from_project_txt(buf, name, section, key, add_self, recursive,
names_only): names_only):
#if name in buf: if name in buf:
# return return
if recursive:
deps = get_value(name, section, key)
if deps:
deps = deps.split(',')
for dep in deps:
mod = strip_module_from_spec(dep)
add_modules_from_project_txt(buf, mod,
section, key, add_self=True, recursive=True,
names_only=names_only)
if names_only:
buf.add(mod)
else:
buf.add(dep)
if add_self: if add_self:
buf.add(name) buf.add(name)
deps = get_value(name, section, key)
if not deps:
return
deps = deps.split(',')
for dep in deps:
if names_only:
buf.add(strip_module_from_spec(dep))
else:
buf.add(dep)
if recursive:
add_modules_from_project_txt(buf, strip_module_from_spec(dep),
section, key, True, recursive, names_only)
def get_modules_from_project_txt(names, section, key, add_self, recursive, def get_modules_from_project_txt(names, section, key, add_self, recursive,
names_only = True): names_only = True):