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

6
test/test_build_is_necessary.py
View file

@ -23,8 +23,8 @@ import pytest
# Import from parent directory
sys.path.insert(0, os.path.realpath(
os.path.join(os.path.dirname(__file__) + "/..")))
import pmb.build.other
import pmb.helpers.logging
import pmb.helpers.pmaports
@pytest.fixture
@ -59,7 +59,7 @@ def cache_apkindex(args, version):
def test_build_is_necessary(args):
# Prepare APKBUILD and APKINDEX data
aport = pmb.build.other.find_aport(args, "hello-world")
aport = pmb.helpers.pmaports.find(args, "hello-world")
apkbuild = pmb.parse.apkbuild(args, aport + "/APKBUILD")
apkbuild["pkgver"] = "1"
apkbuild["pkgrel"] = "2"
@ -88,6 +88,6 @@ def test_build_is_necessary_no_binary_available(args):
hello-world package has not been built yet.
"""
indexes = list(args.cache["apkindex"].keys())
aport = pmb.build.other.find_aport(args, "hello-world")
aport = pmb.helpers.pmaports.find(args, "hello-world")
apkbuild = pmb.parse.apkbuild(args, aport + "/APKBUILD")
assert pmb.build.is_necessary(args, None, apkbuild, indexes) is True