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

commands: port repo_bootstrap (MR 2252)

Browse source 
The repo_bootstrap command is totally standalone and has it's own state,
making it a good candidate for the pmb.commands submodule. Port it over
and move the require_bootstrap() helper function over to
pmb/helpers/pmaports.py

We also fix the call to pmb.build.package() which broke during rework.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
Caleb Connolly 2024-06-08 01:09:03 +02:00 • committed by Oliver Smith
parent 97bd8b96ec
commit f422b5c7ca
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
5 changed files with 198 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pmb/helpers/frontend.py
View file

@ -27,7 +27,6 @@ import pmb.helpers.logging
import pmb.helpers.pkgrel_bump
import pmb.helpers.pmaports
import pmb.helpers.repo
import pmb.helpers.repo_bootstrap
import pmb.helpers.repo_missing
import pmb.helpers.run
import pmb.helpers.status
@ -119,7 +118,7 @@ def build(args: PmbArgs):
# Ensure repo_bootstrap is done for all arches we intend to build for
for package in args.packages:
arch_package = args.arch or pmb.build.autodetect.arch(package)
pmb.helpers.repo_bootstrap.require_bootstrap(arch_package,
pmb.helpers.pmaports.require_bootstrap(arch_package,
f"build {package} for {arch_package}")
context = get_context()
@ -243,10 +242,6 @@ def config(args: PmbArgs):
pmb.helpers.logging.disable()
def repo_bootstrap(args: PmbArgs):
pmb.helpers.repo_bootstrap.main(args.arch, args.repository)
def repo_missing(args: PmbArgs):
missing = pmb.helpers.repo_missing.generate(args.arch, args.overview,
args.package, args.built)
@ -274,7 +269,7 @@ def install(args: PmbArgs):
raise ValueError("Installation using rsync"
" is not currently supported on btrfs filesystem.")
pmb.helpers.repo_bootstrap.require_bootstrap(deviceinfo.arch,
pmb.helpers.pmaports.require_bootstrap(deviceinfo.arch,
f"do 'pmbootstrap install' for {deviceinfo.arch}"
" (deviceinfo_arch)")