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

pmb.helpers.pkgrel_bump.auto_apkindex_files: remove (MR 1912)

Browse source 
Replace the call to this function with the almost identical
pmb.helpers.repo.apkindex_files(), so release channel related changes
only need to be done in one place.
This commit is contained in:
Oliver Smith 2020-04-13 01:16:52 +02:00
parent 3ff0b18a08
commit 5a256f66de
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 24 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

31
pmb/helpers/repo.py
View file

@ -40,9 +40,14 @@ def hash(url, length=8):
return ret
def urls(args, user_repository=True, postmarketos_mirror=True):
def urls(args, user_repository=True, postmarketos_mirror=True, alpine=True):
"""
Get a list of repository URLs, as they are in /etc/apk/repositories.
:param user_repository: add /mnt/pmbootstrap-packages
:param postmarketos_mirror: add postmarketos mirror URLs
:param alpine: add alpine mirror URLs
:returns: list of mirror strings, like ["/mnt/pmbootstrap-packages",
"http://...", ...]
"""
ret = []
@ -70,28 +75,36 @@ def urls(args, user_repository=True, postmarketos_mirror=True):
ret.append(f"{mirror}{mirrordir_pmos}")
# Upstream Alpine Linux repositories
directories = ["main", "community"]
if mirrordir_alpine == "edge":
directories.append("testing")
for dir in directories:
ret.append(f"{args.mirror_alpine}{mirrordir_alpine}/{dir}")
if alpine:
directories = ["main", "community"]
if mirrordir_alpine == "edge":
directories.append("testing")
for dir in directories:
ret.append(f"{args.mirror_alpine}{mirrordir_alpine}/{dir}")
return ret
def apkindex_files(args, arch=None):
def apkindex_files(args, arch=None, user_repository=True, pmos=True,
alpine=True):
"""
Get a list of outside paths to all resolved APKINDEX.tar.gz files for a
specific arch.
:param arch: defaults to native
:param user_repository: add path to index of locally built packages
:param pmos: add paths to indexes of postmarketos mirrors
:param alpine: add paths to indexes of alpine mirrors
:returns: list of absolute APKINDEX.tar.gz file paths
"""
if not arch:
arch = args.arch_native
ret = []
# Local user repository (for packages compiled with pmbootstrap)
ret = [args.work + "/packages/" + arch + "/APKINDEX.tar.gz"]
if user_repository:
ret = [args.work + "/packages/" + arch + "/APKINDEX.tar.gz"]
# Resolve the APKINDEX.$HASH.tar.gz files
for url in urls(args, False):
for url in urls(args, False, pmos, alpine):
ret.append(args.work + "/cache_apk_" + arch + "/APKINDEX." +
hash(url) + ".tar.gz")