forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

ci/check_changed_aports_ver: move apkbuild reading from get_version (MR 4994)

Browse source 
This allows reusing the logic to read apkbuild contents in future
methods
This commit is contained in:
Clayton Craft 2024-04-12 12:30:17 -07:00
parent 284fd42c0a
commit 07812a9189
No known key found for this signature in database
GPG key ID: 4A4CED6D7EDF950A
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.ci/lib/check_changed_aports_versions.py
View file

@ -16,8 +16,7 @@ import pmb.parse
import pmb.parse.version
import pmb.helpers.logging
def get_package_version(args, package, revision, check=True):
def get_package_contents(args, package, revision, check=True):
# Redirect stderr to /dev/null, so git doesn't complain about files not
# existing in upstream branch for new packages
stderr = None
@ -40,6 +39,11 @@ def get_package_version(args, package, revision, check=True):
handle.write(apkbuild_content)
parsed = pmb.parse.apkbuild(tempdir + "/APKBUILD", False, False)
return parsed
def get_package_version(args, package, revision, check=True):
parsed = get_package_contents(args, package, revision, check)
return parsed["pkgver"] + "-r" + parsed["pkgrel"]