mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
projects.py: Preserve order in projects.py
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
69bcd617b2
commit
791ad4e5f8
1 changed files with 9 additions and 10 deletions
|
|
@ -66,29 +66,28 @@ def get_value(name, section, key):
|
|||
return r[0]
|
||||
return None
|
||||
|
||||
def add_modules_from_project_txt(buf, name, section, key, add_self, recursive,
|
||||
def add_modules_from_project_txt(buf, spec, section, key, add_self, recursive,
|
||||
names_only):
|
||||
if name in buf:
|
||||
name = strip_module_from_spec(spec)
|
||||
if names_only:
|
||||
spec = name
|
||||
if spec in buf:
|
||||
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,
|
||||
add_modules_from_project_txt(buf, dep,
|
||||
section, key, add_self=True, recursive=True,
|
||||
names_only=names_only)
|
||||
if names_only:
|
||||
buf.add(mod)
|
||||
else:
|
||||
buf.add(dep)
|
||||
if add_self:
|
||||
buf.add(name)
|
||||
buf.append(name)
|
||||
|
||||
def get_modules_from_project_txt(names, section, key, add_self, recursive,
|
||||
names_only = True):
|
||||
r = Set()
|
||||
#r = Set()
|
||||
r = []
|
||||
for name in names:
|
||||
add_modules_from_project_txt(r, name, section, key, add_self, recursive,
|
||||
names_only)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue