diff --git a/pmb/chroot/mount.py b/pmb/chroot/mount.py index 762d9937..e1795e80 100644 --- a/pmb/chroot/mount.py +++ b/pmb/chroot/mount.py @@ -97,11 +97,6 @@ def mount(args, suffix="native"): source = source.replace("$ARCH", arch) mountpoints[source] = target - # Add the pmOS binary repo (in case it is set and points to a local folder) - mirror = args.mirror_postmarketos - if os.path.exists(mirror): - mountpoints[mirror] = "/mnt/postmarketos-mirror" - # Mount if necessary for source, target in mountpoints.items(): target_full = args.work + "/chroot_" + suffix + target diff --git a/pmb/helpers/repo.py b/pmb/helpers/repo.py index 573e51c1..2ca1c5ca 100644 --- a/pmb/helpers/repo.py +++ b/pmb/helpers/repo.py @@ -68,10 +68,7 @@ def urls(args, user_repository=True, postmarketos_mirror=True): # Upstream postmarketOS binary repository if postmarketos_mirror and args.mirror_postmarketos: - if os.path.exists(args.mirror_postmarketos): - ret.append("/mnt/postmarketos-mirror") - else: - ret.append(args.mirror_postmarketos) + ret.append(args.mirror_postmarketos) # Upstream Alpine Linux repositories directories = ["main", "community"] @@ -98,11 +95,7 @@ def apkindex_files(args, arch=None): urls_todo = [] mirror = args.mirror_postmarketos if mirror: - if os.path.exists(mirror): - ret.append(mirror + "/" + arch + "/APKINDEX.tar.gz") - else: - # Non-local path: treat it like other URLs - urls_todo.append(mirror) + urls_todo.append(mirror) # Resolve the APKINDEX.$HASH.tar.gz files urls_todo += urls(args, False, False)