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

Fix quotation reuse (MR 2336)

Browse source 
Python 3.10.12 fails without this patch:

File "/media/gompa/73d88639-a730-456c-a428-6d500b4020b7/pmbootstrap/pmb/parse/arguments.py", line 844 help="Alpine Linux mirror, default: " f"{default_config.mirrors["alpine"]}",
SyntaxError: f-string: unmatched '['

Related: https://peps.python.org/pep-0701/
(Commit message written by Oliver)
This commit is contained in:
gompa 2024-06-24 19:08:21 +02:00 • committed by Oliver Smith
parent 8c0bc2e0e8
commit 8390a093d8
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pmb/chroot/apk_static.py
View file

@ -153,7 +153,7 @@ def download(file):
""" """
channel_cfg = pmb.config.pmaports.read_config_channel() channel_cfg = pmb.config.pmaports.read_config_channel()
mirrordir = channel_cfg["mirrordir_alpine"] mirrordir = channel_cfg["mirrordir_alpine"]
base_url = f"{get_context().config.mirrors["alpine"]}{mirrordir}/main/{Arch.native()}" base_url = f"{get_context().config.mirrors['alpine']}{mirrordir}/main/{Arch.native()}"
return pmb.helpers.http.download(f"{base_url}/{file}", file) return pmb.helpers.http.download(f"{base_url}/{file}", file)

2
pmb/config/init.py
View file

@ -476,7 +476,7 @@ def ask_for_additional_options(config):
f" parallel jobs: {config.jobs}," f" parallel jobs: {config.jobs},"
f" ccache per arch: {config.ccache_size}," f" ccache per arch: {config.ccache_size},"
f" sudo timer: {context.sudo_timer}," f" sudo timer: {context.sudo_timer},"
f" mirror: {config.mirrors["pmaports"]}" f" mirror: {config.mirrors['pmaports']}"
) )
if not pmb.helpers.cli.confirm("Change them?", default=False): if not pmb.helpers.cli.confirm("Change them?", default=False):

2
pmb/helpers/repo.py
View file

@ -233,6 +233,6 @@ def alpine_apkindex_path(repo="main", arch: Optional[Arch] = None):
# Find it on disk # Find it on disk
channel_cfg = pmb.config.pmaports.read_config_channel() channel_cfg = pmb.config.pmaports.read_config_channel()
repo_link = f"{get_context().config.mirrors["alpine"]}{channel_cfg['mirrordir_alpine']}/{repo}" repo_link = f"{get_context().config.mirrors['alpine']}{channel_cfg['mirrordir_alpine']}/{repo}"
cache_folder = get_context().config.work / (f"cache_apk_{arch}") cache_folder = get_context().config.work / (f"cache_apk_{arch}")
return cache_folder / apkindex_hash(repo_link) return cache_folder / apkindex_hash(repo_link)

2
pmb/parse/arguments.py
View file

@ -841,7 +841,7 @@ def get_parser():
"-m", "-m",
"--mirror-alpine", "--mirror-alpine",
dest="mirror_alpine", dest="mirror_alpine",
help="Alpine Linux mirror, default: " f"{default_config.mirrors["alpine"]}", help="Alpine Linux mirror, default: " f"{default_config.mirrors['alpine']}",
metavar="URL", metavar="URL",
) )
parser.add_argument("-j", "--jobs", help="parallel jobs when compiling") parser.add_argument("-j", "--jobs", help="parallel jobs when compiling")