Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2024-12-23 06:22:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix dependencies still being added if in provides

Browse Source 
Fixes #226
This commit is contained in:
rubenwardy 2020-08-18 00:16:03 +01:00
parent 8fd229b739
commit 3914659718
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/tasks/importtasks.py
View File

@ -167,16 +167,27 @@ def updateMetaFromRelease(self, id, path):
package.provides.clear()
package.provides.extend(provides)
for dep in package.dependencies:
if dep.meta_package:
db.session.delete(dep)
# Delete all meta package dependencies
package.dependencies.filter(Dependency.meta_package != None).delete()
for meta in getMetaPackages(tree.fold("meta", "depends")):
# Get raw dependencies
depends = tree.fold("meta", "depends")
optional_depends = tree.fold("meta", "optional_depends")
# Filter out provides
for mod in provides:
depends.discard(mod)
optional_depends.discard(mod)
# Add dependencies
for meta in getMetaPackages(depends):
db.session.add(Dependency(package, meta=meta, optional=False))
for meta in getMetaPackages(tree.fold("meta", "optional_depends")):
for meta in getMetaPackages(optional_depends):
db.session.add(Dependency(package, meta=meta, optional=True))
db.session.commit()
except MinetestCheckError as err: