From 1c10dbee50301effaaa1fbf5cb6724cf2687bf8d Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 3 Dec 2018 21:02:18 +0100 Subject: [PATCH] repo_missing: fix "could not find aport" error In pmb.helpers.package.get(), we are differentiating between packages that do not exist at all, and packages that do not exist for the specified architecture. Make sure to actuallyy download the foreign arch APKINDEX files, before trying to find the packages in there. Otherwise the "could not find aport, and could not find this package in any APKINDEX" package would appear. We ran into this when testing on sr.ht, because pmbootstrap runs on a fresh install every time, where no old APKINDEX files are present (which would work around the bug). This was meant to be part of the previous commit already, and was tested, but it was not submitted correctly. So here it is as separate commit straight to master. It is trivial anyway. --- pmb/helpers/package.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pmb/helpers/package.py b/pmb/helpers/package.py index 08adc392..d94cb3c8 100644 --- a/pmb/helpers/package.py +++ b/pmb/helpers/package.py @@ -29,6 +29,7 @@ import logging import copy import pmb.helpers.pmaports +import pmb.helpers.repo def get(args, pkgname, arch): @@ -69,6 +70,7 @@ def get(args, pkgname, arch): # Find in APKINDEX (other arches) if not ret: + pmb.helpers.repo.update(args) for arch_i in pmb.config.build_device_architectures: if arch_i != arch: ret = pmb.parse.apkindex.package(args, pkgname, arch_i, False)