From cce91758a150f24f0e76fade299a5bb8ce8508b0 Mon Sep 17 00:00:00 2001 From: Daniele Debernardi Date: Thu, 22 Nov 2018 00:48:45 +0100 Subject: [PATCH] Install latest built version of the package instead of APKBUILD version --- pmb/chroot/apk.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pmb/chroot/apk.py b/pmb/chroot/apk.py index 9b04a101..29be8cdf 100644 --- a/pmb/chroot/apk.py +++ b/pmb/chroot/apk.py @@ -168,10 +168,9 @@ def replace_aports_packages_with_path(args, packages, suffix, arch): for package in packages: aport = pmb.build.find_aport(args, package, False) if aport: - apkbuild = pmb.parse.apkbuild(args, aport + "/APKBUILD") + data_repo = pmb.parse.apkindex.package(args, package, arch, False) apk_path = ("/mnt/pmbootstrap-packages/" + arch + "/" + - package + "-" + apkbuild["pkgver"] + "-r" + - apkbuild["pkgrel"] + ".apk") + package + "-" + data_repo["version"] + ".apk") if os.path.exists(args.work + "/chroot_" + suffix + apk_path): package = apk_path ret.append(package)