Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pmbootstrap
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
postmarketOS
pmbootstrap
Commits
ce79061a
Commit
ce79061a
authored
5 months ago
by
Luca Weiss
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
pmb/helpers/pkgrel_bump.py
+6
-5
6 additions, 5 deletions
pmb/helpers/pkgrel_bump.py
with
6 additions
and
5 deletions
pmb/helpers/pkgrel_bump.py
+
6
−
5
View file @
ce79061a
# 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
,
ap
k
,
dry
:
bool
=
False
)
->
bool
:
def
auto_apkindex_package
(
arch
:
Arch
,
aport
:
dict
[
str
,
Any
],
apk
:
ApkindexBloc
k
,
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment