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

pmb: Migrate pkgrel_bump to Command (MR 2411)

Browse source 
Also remove args from functions that don't actually need it to
faciliate this.

This does not attempt to fix any of the bugs with pkgrel_bump.
This commit is contained in:
Stefan Hansson 2024-09-26 17:39:33 +02:00
parent 3d60673f64
commit 8a64c9da8f
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
4 changed files with 41 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pmb/helpers/frontend.py
View file

@ -27,7 +27,6 @@ import pmb.helpers.devices
import pmb.helpers.git
import pmb.helpers.lint
import pmb.helpers.logging
import pmb.helpers.pkgrel_bump
import pmb.helpers.pmaports
import pmb.helpers.repo
import pmb.helpers.repo_missing
@ -501,24 +500,6 @@ def apkindex_parse(args: PmbArgs) -> None:
print(json.dumps(result, indent=4))
def pkgrel_bump(args: PmbArgs) -> None:
would_bump = True
if args.auto:
would_bump = bool(pmb.helpers.pkgrel_bump.auto(args, args.dry))
else:
# Each package must exist
for package in args.packages:
pmb.helpers.pmaports.find(package)
# Increase pkgrel
for package in args.packages:
pmb.helpers.pkgrel_bump.package(args, package, dry=args.dry)
if args.dry and would_bump:
logging.info("Pkgrels of package(s) would have been bumped!")
sys.exit(1)
def aportupgrade(args: PmbArgs) -> None:
if args.all or args.all_stable or args.all_git:
pmb.helpers.aportupgrade.upgrade_all(args)

11
pmb/helpers/pkgrel_bump.py
View file

@ -3,7 +3,6 @@
from pmb.core.arch import Arch
from pmb.helpers import logging
from pmb.types import PmbArgs
import pmb.helpers.file
import pmb.helpers.pmaports
import pmb.helpers.repo
@ -11,7 +10,7 @@ import pmb.parse
import pmb.parse.apkindex
def package(args: PmbArgs, pkgname: str, reason="", dry: bool = False) -> None:
def package(pkgname: str, reason="", dry: bool = False) -> None:
"""Increase the pkgrel in the APKBUILD of a specific package.
:param pkgname: name of the package
@ -54,7 +53,7 @@ def package(args: PmbArgs, pkgname: str, reason="", dry: bool = False) -> None:
)
def auto_apkindex_package(args: PmbArgs, arch, aport, apk, dry: bool = False) -> bool:
def auto_apkindex_package(arch, aport, apk, dry: bool = False) -> bool:
"""Bump the pkgrel of a specific package if it is outdated in the given APKINDEX.
:param arch: the architecture, e.g. "armhf"
@ -103,13 +102,13 @@ def auto_apkindex_package(args: PmbArgs, arch, aport, apk, dry: bool = False) ->
# Increase pkgrel
if len(missing):
package(args, pkgname, reason=", missing depend(s): " + ", ".join(missing), dry=dry)
package(pkgname, reason=", missing depend(s): " + ", ".join(missing), dry=dry)
return True
return False
def auto(args: PmbArgs, dry=False) -> list[str]:
def auto(dry=False) -> list[str]:
""":returns: list of aport names, where the pkgrel needed to be changed"""
ret = []
for arch in Arch.supported():
@ -128,6 +127,6 @@ def auto(args: PmbArgs, dry=False) -> list[str]:
logging.warning(f"{pkgname}: origin '{origin}' aport not found")
continue
aport = pmb.parse.apkbuild(aport_path)
if auto_apkindex_package(args, arch, aport, apk, dry):
if auto_apkindex_package(arch, aport, apk, dry):
ret.append(pkgname)
return ret