From d8e50373365e41f544f9041f903816ac5f701df1 Mon Sep 17 00:00:00 2001 From: Caleb Connolly Date: Thu, 18 Jul 2024 02:34:23 +0200 Subject: [PATCH] build: package: build build packages even when nothing else is queued (MR 2376) Bail on empty build queue after checking if build_packages need building. So if apk-tools / alpine-base / etc are outdated but nothing else is they'll still be built. Signed-off-by: Caleb Connolly --- pmb/build/_package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pmb/build/_package.py b/pmb/build/_package.py index 4b487166..81b1cdd7 100644 --- a/pmb/build/_package.py +++ b/pmb/build/_package.py @@ -420,9 +420,6 @@ def packages( context, queue_build, pkgname, arch, fallback_arch, force ) - if not len(build_queue): - return [] - # If any of our common build packages need to be built and are missing, then add them # to the queue so they're built first. This is necessary so that our abuild fork is # always built first (for example). For now assume that if building in strict mode we @@ -443,6 +440,9 @@ def packages( ) queue_build(aport, apkbuild, get_depends(context, apkbuild)) + if not len(build_queue): + return [] + # We built the queue by pushing each package before it's dependencies. Now we # need to go backwards through the queue and build the dependencies first. build_queue.reverse()