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

config: pmaports: drop legacy checks (MR 2252)

Browse source 
It's been 6(?) years since pmaports moved out of the pmbootstrap repo.
Let's finally drop these checks.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
Caleb Connolly 2024-05-25 00:51:28 +02:00 • committed by Oliver Smith
parent e547bb7f9c
commit bfea00e03a
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
1 changed files with 5 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

39
pmb/config/pmaports.py
View file

@ -12,21 +12,7 @@ import pmb.helpers.pmaports
import pmb.parse.version import pmb.parse.version
def check_legacy_folder(): def clone():
# Existing pmbootstrap/aports must be a symlink
link = pmb.config.pmb_src / "aports"
if os.path.exists(link) and not os.path.islink(link):
raise RuntimeError(f"The path '{link}' should be a"
" symlink pointing to the new pmaports"
" repository, which was split from the"
" pmbootstrap repository (#383). Consider"
" making a backup of that folder, then delete"
" it and run 'pmbootstrap init' again to let"
" pmbootstrap clone the pmaports repository and"
" set up the symlink.")
def clone(args: PmbArgs):
logging.info("Setting up the native chroot and cloning the package build" logging.info("Setting up the native chroot and cloning the package build"
" recipes (pmaports)...") " recipes (pmaports)...")
@ -34,19 +20,6 @@ def clone(args: PmbArgs):
pmb.helpers.git.clone("pmaports") pmb.helpers.git.clone("pmaports")
def symlink(args: PmbArgs):
# Create the symlink
# This won't work when pmbootstrap was installed system wide, but that's
# okay since the symlink is only intended to make the migration to the
# pmaports repository easier.
link = pmb.config.pmb_src / "aports"
try:
os.symlink(args.aports, link)
logging.info(f"NOTE: pmaports path: {link}")
except:
logging.info(f"NOTE: pmaports path: {args.aports}")
def check_version_pmaports(real): def check_version_pmaports(real):
# Compare versions # Compare versions
min = pmb.config.pmaports_min_version min = pmb.config.pmaports_min_version
@ -176,12 +149,10 @@ def read_config_channel(args: PmbArgs):
" branch). Looks like a very old branch.") " branch). Looks like a very old branch.")
def init(args: PmbArgs): def init():
check_legacy_folder() if not os.path.exists(get_context().aports):
if not os.path.exists(args.aports): clone()
clone(args) read_config()
symlink(args)
read_config(args)
def switch_to_channel_branch(args: PmbArgs, channel_new): def switch_to_channel_branch(args: PmbArgs, channel_new):