fix: keep discovered subpackages in place

This commit is contained in:
arcanis committed 2026-11-16 19:51:53 +02:00
1 parent f0d523492d
commit a10b1a9364
3 files changed
+51 -6

No files matched your search

@@ -144,7 +144,7 @@ class Application(ApplicationPackages, ApplicationRepository):
if dependency not in satisfied_packages if dependency not in satisfied_packages
} }
def new_packages(root: Package) -> list[Package]: def new_packages(root: Package) -> dict[str, Package]:
portion = {root.base: root} portion = {root.base: root}
while missing := missing_dependencies(portion.values()): while missing := missing_dependencies(portion.values()):
for package_name, packager in missing.items(): for package_name, packager in missing.items():
@@ -153,12 +153,15 @@ class Application(ApplicationPackages, ApplicationRepository):
leaf = Package.from_build(source_dir, self.repository.repository_id.architecture, packager) leaf = Package.from_build(source_dir, self.repository.repository_id.architecture, packager)
else: else:
leaf = Package.from_aur(package_name, packager, include_provides=True) leaf = Package.from_aur(package_name, packager, include_provides=True)
portion[leaf.base] = leaf # for split packages we need to load all available subpackages here
if (existing := portion.get(leaf.base)) is not None:
leaf.packages.update(existing.packages)
portion[leaf.base] = leaf
# register package in the database # register package in the database
self.reporter.set_unknown(leaf) self.reporter.set_unknown(leaf)
return [leaf for package_name, leaf in portion.items() if package_name != root.base] return portion
known_packages = self._known_packages() known_packages = self._known_packages()
for package in plan: for package in plan:
@@ -169,6 +172,10 @@ class Application(ApplicationPackages, ApplicationRepository):
self.logger.exception("could not process dependencies of %s, skip the package", package.base) self.logger.exception("could not process dependencies of %s, skip the package", package.base)
continue continue
plan.update(packages, BuildPlanReason.RequiredBy, package.base) # update existing package
item = plan.item(package.base)
plan.add(packages.pop(package.base), item.reason, item.requester)
# append dependencies
plan.update(packages.values(), BuildPlanReason.RequiredBy, package.base)
return plan return plan
@@ -122,12 +122,12 @@ class BuildPlan(Iterable[Package]):
""" """
return self._items[package_base] return self._items[package_base]
def update(self, packages: list[Package], reason: BuildPlanReason, requester: str | None = None) -> Self: def update(self, packages: Iterable[Package], reason: BuildPlanReason, requester: str | None = None) -> Self:
""" """
bulk update packages with the same reason bulk update packages with the same reason
Args: Args:
packages(list[Package]): list of new packages to be added packages(Iterable[Package]): list of new packages to be added
reason(BuildPlanReason): reason for selecting them reason(BuildPlanReason): reason for selecting them
requester(str | None, optional): package requiring these dependencies (Default value = None) requester(str | None, optional): package requiring these dependencies (Default value = None)
@@ -4,8 +4,10 @@ from typing import Any
from unittest.mock import MagicMock, call as MockCall from unittest.mock import MagicMock, call as MockCall
from ahriman.application.application import Application from ahriman.application.application import Application
from ahriman.core.tree import Tree
from ahriman.models.build_plan import BuildPlan, BuildPlanReason from ahriman.models.build_plan import BuildPlan, BuildPlanReason
from ahriman.models.package import Package from ahriman.models.package import Package
from ahriman.models.package_description import PackageDescription
from ahriman.models.result import Result from ahriman.models.result import Result
@@ -118,6 +120,42 @@ def test_with_dependencies(application: Application, package_ahriman: Package, p
], any_order=True) ], any_order=True)
def test_with_dependencies_split(application: Application, package_ahriman: Package, mocker: MockerFixture) -> None:
"""
must preserve resolved subpackages during dependency resolution
"""
def package(base: str, name: str, dependencies: list[str]) -> Package:
return Package(
base=base,
version="1-1",
remote=package_ahriman.remote,
packages={name: PackageDescription(depends=dependencies)},
)
packages = {
"ahriman-core": package("ahriman", "ahriman-core", ["python-tree-sitter-bash"]),
"ahriman-web": package("ahriman", "ahriman-web", ["ahriman-core"]),
"python-tree-sitter-bash": package("python-tree-sitter-bash", "python-tree-sitter-bash", []),
}
mocker.patch("ahriman.application.application.Application._known_packages", return_value=set())
mocker.patch("pathlib.Path.is_dir", return_value=False)
mocker.patch("ahriman.models.package.Package.from_aur", side_effect=lambda name, *args, **kwargs: packages[name])
mocker.patch("ahriman.core.status.Client.set_unknown")
plan = BuildPlan().update([
package("ahriman", "ahriman", ["ahriman-core", "ahriman-web"])
], BuildPlanReason.QueuedRequest)
result = application.with_dependencies(plan, process_dependencies=True)
assert [[item.base for item in level] for level in Tree.resolve(result)] == [
["python-tree-sitter-bash"], ["ahriman"],
]
plan_item = result.item("ahriman")
assert plan_item.package.packages.keys() == {"ahriman", "ahriman-core", "ahriman-web"}
assert plan_item.reason == BuildPlanReason.QueuedRequest
assert plan_item.requester is None
def test_with_dependencies_exception(application: Application, package_ahriman: Package, def test_with_dependencies_exception(application: Application, package_ahriman: Package,
package_python_schedule: Package, mocker: MockerFixture) -> None: package_python_schedule: Package, mocker: MockerFixture) -> None:
""" """