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

"pkgrel_bump --auto": Handle subpackages properly (#1388)

Browse source 
`pmbootstrap pkgrel_bump --auto` automatically increases the pkgrel for
packages linking against libraries, which don't exist anymore (because
the soname has been changed). The feature is explained in detail in

The previous implementation did not detect soname breakage, when a
subpackage linked against a certain library, but the main package
did not (e.g. `qt5-qtbase-mysql` and `qt5-qtbase`). This was, because
we iterated over the aports/* to find the packages to be checked.

To fix this, we are iterating over the packages found in the APKINDEX
files instead (of both the locally compiled packages and the downloaded
index from the pmOS mirror).

Details:
* `pmb/helpers/pkgrel_bump.py`:
  * Rewrite `auto_apkindex_package()` to act upon a given parsed
    `aport` and `apk` (from the index) instead of finding the `apk`
    dict by itself (we need it earlier anyway).
  * Rewrite `auto()` to iterate over APKINDEX files instead of aports
    * Skip packages already found, so the `pkgrel` does not get
      increased multiple times when the same package was found in
      multipe index files.
* Put the package name at the beginning of the log messages to make
  them more readable
* testdata: Create a new `testsubpkg` aport, where only the subpackage
  links against `testlib`
* Adjust testing code to test everything with `testsubpkg` as well.

NOTE: This makes the command a bit slower, but we could improve
performance again by smart caching of `pmb.parse.apkindex.depends()`.
This could come in a future PR, the important part here is that the
command is bug-free again with this fix.
This commit is contained in:
Oliver Smith 2018-04-15 21:34:40 +00:00 • committed by GitHub
parent 4388c6614d
commit ca20ead505
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 101 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

33
test/test_pkgrel_bump.py
View file

@ -98,7 +98,7 @@ def setup_work(args, tmpdir):
"/_aports/" + folder])
pmb.helpers.run.user(args, ["cp", "-r", args.aports + "/device/device-" +
args.device, tmpdir + "/_aports/device"])
for pkgname in ["testlib", "testapp"]:
for pkgname in ["testlib", "testapp", "testsubpkg"]:
pmb.helpers.run.user(args, ["cp", "-r",
"test/testdata/pkgrel_bump/aports/" + pkgname,
tmpdir + "/_aports/main/" + pkgname])
@ -112,12 +112,16 @@ def setup_work(args, tmpdir):
"/_pmbootstrap.cfg"])
def verify_pkgrels(args, tmpdir, pkgrel_testlib, pkgrel_testapp):
def verify_pkgrels(args, tmpdir, pkgrel_testlib, pkgrel_testapp,
pkgrel_testsubpkg):
"""
Verify the pkgrels of the two test APKBUILDs "testlib" and "testapp".
Verify the pkgrels of the three test APKBUILDs ("testlib", "testapp",
"testsubpkg").
"""
args.cache["apkbuild"] = {}
mapping = {"testlib": pkgrel_testlib, "testapp": pkgrel_testapp}
mapping = {"testlib": pkgrel_testlib,
"testapp": pkgrel_testapp,
"testsubpkg": pkgrel_testsubpkg}
for pkgname, pkgrel in mapping.items():
# APKBUILD path
path = tmpdir + "/_aports/main/" + pkgname + "/APKBUILD"
@ -133,38 +137,37 @@ def test_pkgrel_bump_high_level(args, tmpdir):
setup_work(args, tmpdir)
# Let pkgrel_bump exit normally
pmbootstrap(args, tmpdir, ["build", "testlib"])
pmbootstrap(args, tmpdir, ["build", "testapp"])
pmbootstrap(args, tmpdir, ["build", "testlib", "testapp", "testsubpkg"])
pmbootstrap(args, tmpdir, ["pkgrel_bump", "--dry", "--auto"])
verify_pkgrels(args, tmpdir, 0, 0)
verify_pkgrels(args, tmpdir, 0, 0, 0)
# Increase soname (testlib soname changes with the pkgrel)
pmbootstrap(args, tmpdir, ["pkgrel_bump", "testlib"])
verify_pkgrels(args, tmpdir, 1, 0)
verify_pkgrels(args, tmpdir, 1, 0, 0)
pmbootstrap(args, tmpdir, ["build", "testlib"])
pmbootstrap(args, tmpdir, ["pkgrel_bump", "--dry", "--auto"])
verify_pkgrels(args, tmpdir, 1, 0)
verify_pkgrels(args, tmpdir, 1, 0, 0)
# Delete package with previous soname (--auto-dry exits with >0 now)
pmb.helpers.run.root(args, ["rm", tmpdir + "/packages/" +
args.arch_native + "/testlib-1.0-r0.apk"])
pmbootstrap(args, tmpdir, ["index"])
pmbootstrap(args, tmpdir, ["pkgrel_bump", "--dry", "--auto"], False)
verify_pkgrels(args, tmpdir, 1, 0)
verify_pkgrels(args, tmpdir, 1, 0, 0)
# Bump the pkgrel of testapp and build it
# Bump pkgrel and build testapp/testsubpkg
pmbootstrap(args, tmpdir, ["pkgrel_bump", "--auto"])
verify_pkgrels(args, tmpdir, 1, 1)
pmbootstrap(args, tmpdir, ["build", "testapp"])
verify_pkgrels(args, tmpdir, 1, 1, 1)
pmbootstrap(args, tmpdir, ["build", "testapp", "testsubpkg"])
# After rebuilding, pkgrel_bump --auto-dry exits with 0
pmbootstrap(args, tmpdir, ["pkgrel_bump", "--dry", "--auto"])
verify_pkgrels(args, tmpdir, 1, 1)
verify_pkgrels(args, tmpdir, 1, 1, 1)
# Test running with specific package names
pmbootstrap(args, tmpdir, ["pkgrel_bump", "invalid_package_name"], False)
pmbootstrap(args, tmpdir, ["pkgrel_bump", "--dry", "testlib"], False)
verify_pkgrels(args, tmpdir, 1, 1)
verify_pkgrels(args, tmpdir, 1, 1, 1)
# Clean up
pmbootstrap(args, tmpdir, ["shutdown"])