patrick
/
libinstaller
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Sort libraries to be installed only after dependencies that are actually present

This commit is contained in:
Patrick Lipka 2022-09-29 19:27:42 +02:00
parent 6599432c75
commit 7d5cafef54
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/sort.py
View File

@ -25,14 +25,24 @@ def sort_libs_by_dependencies(selected_libs):
if len(selected_libs) < 2: if len(selected_libs) < 2:
return selected_libs return selected_libs
lib_names = []
for lib in selected_libs:
lib_names.append(lib['name'])
deplist = [] deplist = []
for lib in selected_libs: for lib in selected_libs:
name = lib['name'] name = lib['name']
dependencies = set(lib['dependencies'].split(',')) # only sort after dependencies that are actually present to avoid cyclic dependencies
deps = []
for dep in lib['dependencies'].split(','):
if dep in lib_names:
deps.append(dep)
dependencies = set(deps)
if dependencies == {''}: if dependencies == {''}:
dependencies = {} dependencies = {}
deplist.append([name, dependencies]) deplist.append([name, dependencies])
sorted_deplist = topological_sort(deplist) sorted_deplist = topological_sort(deplist)
sorted = [] sorted = []
for entry in sorted_deplist: for entry in sorted_deplist:
for lib in selected_libs: for lib in selected_libs: