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

parse: deviceinfo: make Deviceinfo a class (MR 2252)

Browse source 
Introduce a Deviceinfo class and use it rather than the dictionary. This
gives us sweet sweet autocomplete, and lays the foundation for having a
proper deviceinfo validator in the future.

Additionally, continue refactoring out args...

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

8
pmb/helpers/other.py
View file

@ -107,7 +107,7 @@ def migrate_work_folder(args: PmbArgs):
raise RuntimeError("Aborted.")
# Zap and update abuild.conf
pmb.chroot.zap(args, False)
pmb.chroot.zap(False)
conf = context.config.work / "config_abuild/abuild.conf"
if os.path.exists(conf):
pmb.helpers.run.root(["sed", "-i",
@ -145,7 +145,7 @@ def migrate_work_folder(args: PmbArgs):
raise RuntimeError("Aborted.")
# Zap chroots
pmb.chroot.zap(args, False)
pmb.chroot.zap(False)
# Update version file
migrate_success(context.config.work, 3)
@ -186,7 +186,7 @@ def migrate_work_folder(args: PmbArgs):
raise RuntimeError("Aborted.")
# Zap chroots
pmb.chroot.zap(args, False)
pmb.chroot.zap(False)
# Move packages to edge subdir
edge_path = context.config.work / "packages/edge"
@ -224,7 +224,7 @@ def migrate_work_folder(args: PmbArgs):
# Zap chroots to avoid potential "ERROR: Chroot 'native' was created
# for the 'stable' channel, but you are on the 'v20.05' channel now."
pmb.chroot.zap(args, False)
pmb.chroot.zap(False)
# Migrate
packages_dir = f"{context.config.work}/packages"