Befator-Inc-Firmen-Netzwerk/msys2-autobuild
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 10 Wiki Activity

Some cleanup; don't break cycles if the dep isn't in the repo

Browse Source 
When bootstrapping a cycle we can't fall back to the repo, so
someone has to upload the package manually and we shouldn't try
to build it before that.
This commit is contained in:
Christoph Reiter 2022-03-12 08:53:05 +01:00
parent 1e254ee060
commit a8d63e2852
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autobuild.py
View File

@ -211,6 +211,12 @@ class Package(dict):
build_type = "msys"
return self._get_build(build_type)
def is_optional_dep(self, dep: "Package", dep_type: BuildType):
# Some deps are manually marked as optional to break cycles.
# This requires them to be in the main repo though, otherwise the cycle has to
# be fixed manually.
return dep["name"] in Config.OPTIONAL_DEPS.get(self["name"], []) and not dep.is_new(dep_type)
def get_depends(self, build_type: BuildType) -> "Dict[ArchType, Set[Package]]":
build = self._get_dep_build(build_type)
return build.get('ext-depends', {})
@ -464,7 +470,7 @@ SigLevel=Never
to_add.setdefault(dep_type, []).append(asset)
break
else:
if dep["name"] in Config.OPTIONAL_DEPS.get(pkg["name"], []):
if pkg.is_optional_dep(dep, dep_type):
# If it's there, good, if not we ignore it since it's part of a cycle
pass
else:
@ -815,7 +821,7 @@ def get_buildqueue_with_status(full_details: bool = False) -> List[Package]:
for dep in deps:
dep_status = dep.get_status(dep_type)
if dep_status != PackageStatus.FINISHED:
if dep["name"] in Config.OPTIONAL_DEPS.get(pkg["name"], []):
if pkg.is_optional_dep(dep, dep_type):
continue
pkg.set_blocked(
build_type, PackageStatus.WAITING_FOR_DEPENDENCIES, dep, dep_type)