Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

pmb.chroot.apk: better error for mising apk-tools (MR 2388)

Browse source 
Currently the usr-merge script fails, and this leads to a very confusing
error when running pmbootstrap the next time:

  (stack trace)
  KeyError: 'apk-tools'

Show a more helpful error instead.
This commit is contained in:
Oliver Smith 2024-09-17 00:48:43 +02:00
parent 0109af5245
commit f38d525538
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pmb/chroot/apk.py
View file

@ -24,6 +24,7 @@ import pmb.parse.version
from pmb.core import Chroot from pmb.core import Chroot
from pmb.core.context import get_context from pmb.core.context import get_context
from pmb.types import PathString from pmb.types import PathString
from pmb.helpers.exceptions import NonBugError
@Cache("chroot", "user_repository", mirrors_exclude=[]) @Cache("chroot", "user_repository", mirrors_exclude=[])
@ -89,8 +90,15 @@ def check_min_version(chroot: Chroot = Chroot.native()):
) )
return return
installed_pkgs = installed(chroot)
if "apk-tools" not in installed_pkgs:
raise NonBugError(
"ERROR: could not find apk-tools in chroot, run 'pmbootstrap zap' and try again"
)
# Compare # Compare
version_installed = installed(chroot)["apk-tools"]["version"] version_installed = installed_pkgs["apk-tools"]["version"]
pmb.helpers.apk.check_outdated( pmb.helpers.apk.check_outdated(
version_installed, version_installed,
"Delete your http cache and zap all chroots, then try again:" " 'pmbootstrap zap -hc'", "Delete your http cache and zap all chroots, then try again:" " 'pmbootstrap zap -hc'",