From 11f0b369278105b0c3c5055ca55de0288b54423e Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Thu, 30 Mar 2023 10:00:37 +0300 Subject: [PATCH] Updated for mirror --- slpkg/install_data.py | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/slpkg/install_data.py b/slpkg/install_data.py index d3a9b71d..fcd3d879 100644 --- a/slpkg/install_data.py +++ b/slpkg/install_data.py @@ -216,17 +216,12 @@ class InstallData(Configs): cache.append(split_package[0]) # package name cache.append(split_package[1]) # package version cache.append(package_name) + cache.append(self.repos.gnome_repo_mirror) try: cache.append(checksums_dict[package_name]) except KeyError: cache.append('error checksum') - if line.startswith(pkg_tag[1]): - package_mirror = line.replace(pkg_tag[1], '').strip() - if not package_mirror.endswith('/'): - package_mirror: str = f'{package_mirror}/' - cache.append(package_mirror) - if line.startswith(pkg_tag[2]): package_location = line.replace(pkg_tag[2], '').strip() cache.append(package_location[1:]) # Do not install (.) dot @@ -249,8 +244,8 @@ class InstallData(Configs): name=cache[0], version=cache[1], package=cache[2], - checksum=cache[3], - mirror=cache[4], + mirror=cache[3], + checksum=cache[4], location=cache[5], size_comp=cache[6], size_uncomp=cache[7], @@ -307,17 +302,12 @@ class InstallData(Configs): cache.append(split_package[0]) # package name cache.append(split_package[1]) # package version cache.append(package_name) + cache.append(self.repos.conraid_repo_mirror) try: cache.append(checksums_dict[package_name]) except KeyError: cache.append('error checksum') - if line.startswith(pkg_tag[1]): - package_mirror: str = line.replace(pkg_tag[1], '').strip() - if not package_mirror.endswith('/'): - package_mirror: str = f'{package_mirror}/' - cache.append(package_mirror) - if line.startswith(pkg_tag[2]): package_location: str = line.replace(pkg_tag[2], '').strip() cache.append(package_location[2:]) # Do not install (./) dot @@ -340,8 +330,8 @@ class InstallData(Configs): name=cache[0], version=cache[1], package=cache[2], - checksum=cache[3], - mirror=cache[4], + mirror=cache[3], + checksum=cache[4], location=cache[5], size_comp=cache[6], size_uncomp=cache[7],