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

build.find_aport() -> helpers.pmaports.find()

Browse source 
Move find_aport() and find_aport_guess_main() from pmb/build/other.py
to the new file pmb/helpers/pmaports.py.

Finding aports is not only needed when building packages, hence it
makes sense to move it out of pmb.build. The pmb/helpers/pmaports.py
file will have more pmaports related functions in a follow up commit.
This commit is contained in:
Oliver Smith 2018-11-15 08:30:49 +01:00 • committed by Martijn Braam
parent d7b888907f
commit a44b80b31d
16 changed files with 135 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pmb/helpers/pkgrel_bump.py
View file

@ -19,8 +19,8 @@ along with pmbootstrap. If not, see <http://www.gnu.org/licenses/>.
import logging
import os
import pmb.build.other
import pmb.helpers.file
import pmb.helpers.pmaports
import pmb.helpers.repo
import pmb.parse
@ -34,7 +34,7 @@ def package(args, pkgname, reason="", dry=False):
:param dry: don't modify the APKBUILD, just print the message
"""
# Current and new pkgrel
path = pmb.build.other.find_aport(args, pkgname) + "/APKBUILD"
path = pmb.helpers.pmaports.find(args, pkgname) + "/APKBUILD"
apkbuild = pmb.parse.apkbuild(args, path)
pkgrel = int(apkbuild["pkgrel"])
pkgrel_new = pkgrel + 1
@ -128,7 +128,7 @@ def auto_apkindex_package(args, arch, aport, apk, dry=False):
# (which means dynamic libraries that the package was linked
# against) and packages for which no aport exists.
if (depend.startswith("so:") or
not pmb.build.other.find_aport(args, depend, False)):
not pmb.helpers.pmaports.find(args, depend, False)):
missing.append(depend)
# Increase pkgrel
@ -154,7 +154,7 @@ def auto(args, dry=False):
logging.verbose("{}: origin '{}' found again".format(pkgname,
origin))
continue
aport_path = pmb.build.other.find_aport(args, origin, False)
aport_path = pmb.helpers.pmaports.find(args, origin, False)
if not aport_path:
logging.warning("{}: origin '{}' aport not found".format(
pkgname, origin))