From f3c53e449bb1c9647fb5d171f470f243c96808ad Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Mon, 27 Mar 2023 18:46:50 +0200 Subject: [PATCH] constants: rename %branch% URL marker to %kupfer_branch% and give it its own constant --- constants.py | 3 ++- distro/distro.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/constants.py b/constants.py index e2c87cc..0112f00 100644 --- a/constants.py +++ b/constants.py @@ -39,7 +39,8 @@ REPOSITORIES = [ ] DEFAULT_PACKAGE_BRANCH = 'dev' -KUPFER_HTTPS_BASE = 'https://gitlab.com/kupfer/packages/prebuilts/-/raw/%branch%' +KUPFER_BRANCH_MARKER = '%kupfer_branch%' +KUPFER_HTTPS_BASE = f'https://gitlab.com/kupfer/packages/prebuilts/-/raw/{KUPFER_BRANCH_MARKER}' KUPFER_HTTPS = KUPFER_HTTPS_BASE + '/$arch/$repo' Arch: TypeAlias = str diff --git a/distro/distro.py b/distro/distro.py index 2861b5a..313bd55 100644 --- a/distro/distro.py +++ b/distro/distro.py @@ -1,7 +1,7 @@ from enum import IntFlag from typing import Generic, Mapping, Optional, TypeVar -from constants import Arch, ARCHES, BASE_DISTROS, REPOSITORIES, KUPFER_HTTPS, CHROOT_PATHS +from constants import Arch, ARCHES, BASE_DISTROS, REPOSITORIES, KUPFER_BRANCH_MARKER, KUPFER_HTTPS, CHROOT_PATHS from generator import generate_pacman_conf_body from config.state import config @@ -109,7 +109,7 @@ def reset_distro_caches(): def get_kupfer_url(url: str = KUPFER_HTTPS, branch: Optional[str] = None) -> str: """gets the repo URL for `branch`, getting branch from config if `None` is passed.""" branch = config.file.pacman.repo_branch if branch is None else branch - return url.replace('%branch%', branch) + return url.replace(KUPFER_BRANCH_MARKER, branch) def get_repo_config(*args, **kwargs) -> ReposConfigFile: