Skip to content
Snippets Groups Projects
Unverified Commit 6465a6aa authored by Frieder Hannenheim's avatar Frieder Hannenheim Committed by Oliver Smith
Browse files

sideload: get channel from package not from global pmaports (MR 2569)

Currently packages that are not in the systemd channel cannot be
sideloaded when using the systemd channel. This is because apk sideload
uses the global aports channel and not the channel of the package. Fix
it with this patch.
parent 37706414
No related branches found
No related tags found
1 merge request!2569sideload: get channel from package not from global pmapoirts
Pipeline #217016 passed
......@@ -108,7 +108,6 @@ def sideload(
:param pkgnames: list of pkgnames to be built"""
paths = []
channel: str = pmb.config.pmaports.read_config()["channel"]
if arch is None:
arch = ssh_find_arch(args, user, host, port)
......@@ -121,8 +120,12 @@ def sideload(
if data_repo is None:
raise RuntimeError(f"Couldn't find APKINDEX data for {pkgname}!")
base_aports, _ = pmb.build.get_apkbuild(pkgname)
channel = pmb.config.pmaports.read_config(base_aports)["channel"]
apk_file = f"{pkgname}-{data_repo.version}.apk"
host_path = context.config.work / "packages" / channel / arch / apk_file
if not host_path.is_file():
to_build.append(pkgname)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment