Skip to content
Snippets Groups Projects
Commit ce79061a authored by Luca Weiss's avatar Luca Weiss
Browse files

pmb.helpers.pkgrel_bump: Add type hints and fix auto_apkindex_package

parent a4e59752
No related branches found
No related tags found
No related merge requests found
# Copyright 2023 Oliver Smith
# SPDX-License-Identifier: GPL-3.0-or-later
from enum import Enum
from typing import Any
from pmb.core.apkindex_block import ApkindexBlock
from pmb.core.arch import Arch
from pmb.helpers import logging
......@@ -68,7 +70,7 @@ def package(
)
def auto_apkindex_package(arch, aport, apk, dry: bool = False) -> bool:
def auto_apkindex_package(arch: Arch, aport: dict[str, Any], apk: ApkindexBlock, 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"
......@@ -80,7 +82,7 @@ def auto_apkindex_package(arch, aport, apk, dry: bool = False) -> bool:
:returns: True when there was an APKBUILD that needed to be changed.
"""
version_aport = aport["pkgver"] + "-r" + aport["pkgrel"]
version_apk = apk["version"]
version_apk = apk.version
pkgname = aport["pkgname"]
# Skip when aport version != binary package version
......@@ -99,10 +101,9 @@ def auto_apkindex_package(arch, aport, apk, dry: bool = False) -> bool:
return False
# Find missing depends
depends = apk["depends"]
logging.verbose("{}: checking depends: {}".format(pkgname, ", ".join(depends)))
logging.verbose("{}: checking depends: {}".format(pkgname, ", ".join(apk.depends)))
missing = []
for depend in depends:
for depend in apk.depends:
if depend.startswith("!"):
# Ignore conflict-dependencies
continue
......
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