From 32862117c7fb5d62ee206489757aa59e7b9a2536 Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Sat, 9 Nov 2024 10:22:30 -0500 Subject: [PATCH] Undo dyslexia --- scale_build/bootstrap/bootstrapdir.py | 4 ++-- scale_build/bootstrap/hash.py | 4 ++-- scale_build/image/iso.py | 4 ++-- scale_build/image/update.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scale_build/bootstrap/bootstrapdir.py b/scale_build/bootstrap/bootstrapdir.py index dffe759d..96fd7442 100644 --- a/scale_build/bootstrap/bootstrapdir.py +++ b/scale_build/bootstrap/bootstrapdir.py @@ -3,7 +3,7 @@ import shutil from scale_build.clean import clean_packages -from scale_build.utils.manifest import apt_get_base_url, get_manifest +from scale_build.utils.manifest import get_apt_base_url, get_manifest from scale_build.utils.paths import BUILDER_DIR, CHROOT_BASEDIR, REFERENCE_FILES, REFERENCE_FILES_DIR from scale_build.utils.run import run @@ -46,7 +46,7 @@ def setup_impl(self): self.add_trusted_apt_key() apt_repos = get_manifest()['apt-repos'] - apt_base_url = apt_get_base_url() + apt_base_url = get_apt_base_url() self.debootstrap_debian() self.setup_mounts() diff --git a/scale_build/bootstrap/hash.py b/scale_build/bootstrap/hash.py index 64ba9519..d347b80c 100644 --- a/scale_build/bootstrap/hash.py +++ b/scale_build/bootstrap/hash.py @@ -6,7 +6,7 @@ import requests import urllib.parse -from scale_build.utils.manifest import apt_get_base_url, get_manifest +from scale_build.utils.manifest import get_apt_base_url, get_manifest from scale_build.utils.run import run from scale_build.utils.paths import CACHE_DIR, HASH_DIR @@ -27,7 +27,7 @@ def get_repo_hash(repo_url, distribution): def get_all_repo_hash(): apt_repos = get_manifest()['apt-repos'] - apt_base_url = apt_get_base_url() + apt_base_url = get_apt_base_url() # Start by validating the main APT repo all_repo_hash = get_repo_hash(apt_base_url + apt_repos['url'], apt_repos['distribution']) diff --git a/scale_build/image/iso.py b/scale_build/image/iso.py index b4922564..9f47b5d6 100644 --- a/scale_build/image/iso.py +++ b/scale_build/image/iso.py @@ -10,7 +10,7 @@ import requests from scale_build.exceptions import CallError -from scale_build.utils.manifest import apt_get_base_url, get_manifest +from scale_build.utils.manifest import get_apt_base_url, get_manifest from scale_build.utils.run import run from scale_build.utils.paths import CD_DIR, CD_FILES_DIR, CHROOT_BASEDIR, CONF_GRUB, PKG_DIR, RELEASE_DIR, TMP_DIR from scale_build.config import TRUENAS_VENDOR @@ -134,7 +134,7 @@ def make_iso_file(): with tempfile.NamedTemporaryFile(dir=RELEASE_DIR) as efi_img: with tempfile.NamedTemporaryFile(suffix='.tar.gz') as f: apt_repos = get_manifest()['apt-repos'] - apt_base_url = apt_get_base_url() + apt_base_url = get_apt_base_url() r = requests.get( f'{apt_base_url}{apt_repos["url"]}dists/{apt_repos["distribution"]}' '/main/installer-amd64/current/images/cdrom/' diff --git a/scale_build/image/update.py b/scale_build/image/update.py index b14e7279..38f53a8d 100644 --- a/scale_build/image/update.py +++ b/scale_build/image/update.py @@ -7,7 +7,7 @@ import stat from scale_build.config import SIGNING_KEY, SIGNING_PASSWORD -from scale_build.utils.manifest import apt_get_base_url, get_manifest +from scale_build.utils.manifest import get_apt_base_url, get_manifest from scale_build.utils.run import run from scale_build.utils.paths import CHROOT_BASEDIR, RELEASE_DIR, UPDATE_DIR @@ -110,7 +110,7 @@ def install_rootfs_packages_impl(): def get_apt_sources(): apt_repos = get_manifest()['apt-repos'] - apt_base_url = apt_get_base_url() + apt_base_url = get_apt_base_url() apt_sources = [f'deb {apt_base_url}{apt_repos["url"]} {apt_repos["distribution"]} {apt_repos["components"]}'] for repo in apt_repos['additional']: apt_sources.append(f'deb {apt_base_url}{repo["url"]} {repo["distribution"]} {repo["component"]}')