Skip to content
Snippets Groups Projects
Unverified Commit 2a7864b0 authored by Oliver Smith's avatar Oliver Smith
Browse files

Tweak messages for 'Could not find aport' (MR 2480)

Replace aports -> pmaports in these messages.

$ pmbootstrap build systemd
[17:37:02] NOTE: The package 'systemd' exists in extra-repos/systemd, but systemd is currently disabled
[17:37:02] ERROR: Could not find package 'systemd' in pmaports
parent 67318823
No related branches found
No related tags found
1 merge request!2480pmaports.find: show extra-repos/systemd hint
Pipeline #209976 passed
......@@ -355,9 +355,7 @@ def process_package(
" try again"
)
return []
raise RuntimeError(
f"{pkgname}: Could not find aport, and" " could not find this package in any APKINDEX!"
)
raise RuntimeError(f"{pkgname}: Could not find it in pmaports or any APKINDEX!")
if arch is None:
arch = pmb.build.autodetect.arch(base_apkbuild)
......
......@@ -126,10 +126,7 @@ def get(
# Could not find the package
if not must_exist:
return None
raise RuntimeError(
"Package '" + pkgname + "': Could not find aport, and"
" could not find this package in any APKINDEX!"
)
raise RuntimeError(f"Package '{pkgname}': Could not find it in pmaports or any APKINDEX!")
@Cache("pkgname", "arch")
......
......@@ -205,7 +205,7 @@ def find(package, must_exist=True, subpackages=True, with_extra_repos="default")
# Crash when necessary
if ret is None and must_exist:
show_pkg_not_found_systemd_hint(package, with_extra_repos)
raise RuntimeError("Could not find aport for package: " + package)
raise RuntimeError(f"Could not find package '{package}' in pmaports")
return ret
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment