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

pmb: Remove args from aportgen command (MR 2432)

Browse source
This commit is contained in:
Newbyte 2024-10-11 16:06:17 +02:00 • committed by Oliver Smith
parent 653d45500f
commit 4a0825bdc0
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pmb/aportgen/__init__.py
View file

@ -64,7 +64,7 @@ def properties(pkgname):
raise ValueError("No generator available for " + pkgname + "!") raise ValueError("No generator available for " + pkgname + "!")
def generate(pkgname: str, fork_alpine: bool): def generate(pkgname: str, fork_alpine: bool, fork_alpine_retain_branch: bool = False) -> None:
if fork_alpine: if fork_alpine:
prefix, folder, options = (pkgname, "temp", {"confirm_overwrite": True}) prefix, folder, options = (pkgname, "temp", {"confirm_overwrite": True})
else: else:
@ -83,7 +83,9 @@ def generate(pkgname: str, fork_alpine: bool):
if os.path.exists(aportgen): if os.path.exists(aportgen):
pmb.helpers.run.user(["rm", "-r", aportgen]) pmb.helpers.run.user(["rm", "-r", aportgen])
if fork_alpine: if fork_alpine:
upstream = pmb.aportgen.core.get_upstream_aport(pkgname) upstream = pmb.aportgen.core.get_upstream_aport(
pkgname, retain_branch=fork_alpine_retain_branch
)
pmb.helpers.run.user(["cp", "-r", upstream, aportgen]) pmb.helpers.run.user(["cp", "-r", upstream, aportgen])
pmb.aportgen.core.rewrite( pmb.aportgen.core.rewrite(
pkgname, replace_simple={"# Contributor:*": None, "# Maintainer:*": None} pkgname, replace_simple={"# Contributor:*": None, "# Maintainer:*": None}

7
pmb/aportgen/core.py
View file

@ -6,7 +6,6 @@ from pathlib import Path
import re import re
import pmb.helpers.git import pmb.helpers.git
import pmb.helpers.run import pmb.helpers.run
import pmb.helpers.args
from pmb.core.arch import Arch from pmb.core.arch import Arch
from pmb.core.context import get_context from pmb.core.context import get_context
@ -162,7 +161,7 @@ def rewrite(
handle.truncate() handle.truncate()
def get_upstream_aport(pkgname: str, arch: Arch | None = None): def get_upstream_aport(pkgname: str, arch: Arch | None = None, retain_branch: bool = False):
""" """
Perform a git checkout of Alpine's aports and get the path to the aport. Perform a git checkout of Alpine's aports and get the path to the aport.
@ -175,9 +174,7 @@ def get_upstream_aport(pkgname: str, arch: Arch | None = None):
pmb.helpers.git.clone("aports_upstream") pmb.helpers.git.clone("aports_upstream")
aports_upstream_path = get_context().config.work / "cache_git/aports_upstream" aports_upstream_path = get_context().config.work / "cache_git/aports_upstream"
args = pmb.helpers.args.please_i_really_need_args() if retain_branch:
if getattr(args, "fork_alpine_retain_branch", False):
logging.info("Not changing aports branch as --fork-alpine-retain-branch was " "used.") logging.info("Not changing aports branch as --fork-alpine-retain-branch was " "used.")
else: else:
# Checkout branch # Checkout branch

2
pmb/commands/__init__.py
View file

@ -65,7 +65,7 @@ def run_command(args: PmbArgs):
command: Command command: Command
match args.action: match args.action:
case "aportgen": case "aportgen":
command = Aportgen(args.packages, args.fork_alpine) command = Aportgen(args.packages, args.fork_alpine, args.fork_alpine_retain_branch)
case "log": case "log":
command = Log(args.clear_log, args.lines) command = Log(args.clear_log, args.lines)
case "index": case "index":

7
pmb/commands/aportgen.py
View file

@ -8,11 +8,14 @@ from pmb.helpers import logging
class Aportgen(commands.Command): class Aportgen(commands.Command):
def __init__(self, package_list: list[str], fork_alpine: bool) -> None: def __init__(
self, package_list: list[str], fork_alpine: bool, fork_alpine_retain_branch: bool
) -> None:
self.package_list = package_list self.package_list = package_list
self.fork_alpine = fork_alpine self.fork_alpine = fork_alpine
self.fork_alpine_retain_branch = fork_alpine_retain_branch
def run(self) -> None: def run(self) -> None:
for package in self.package_list: for package in self.package_list:
logging.info(f"Generate aport: {package}") logging.info(f"Generate aport: {package}")
pmb.aportgen.generate(package, self.fork_alpine) pmb.aportgen.generate(package, self.fork_alpine, self.fork_alpine_retain_branch)