Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/mirrors.py
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-11-05 21:37:40 +0100
committerAnton Hvornum <anton@hvornum.se>2021-11-05 21:37:40 +0100
commit0067e349704a4ffae76ae0bcf8cb205a97758b4d (patch)
tree9e9d5085b934c1eda05aba64a33688b0c2f77b39 /archinstall/lib/mirrors.py
parent9bc46a3eb6053fcf9e2c87a087c7ee30c0025491 (diff)
parente411ff0abb11cb0e9117555ada9e84d944dd5ea9 (diff)
Merged latest master
Diffstat (limited to 'archinstall/lib/mirrors.py')
-rw-r--r--archinstall/lib/mirrors.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py
index ed34b5d5..5fad6cb6 100644
--- a/archinstall/lib/mirrors.py
+++ b/archinstall/lib/mirrors.py
@@ -1,8 +1,9 @@
+import logging
import urllib.error
import urllib.request
from typing import Union, Mapping, Iterable
-from .general import *
+from .general import SysCommand
from .output import log
def sort_mirrorlist(raw_data :bytes, sort_order=["https", "http"]) -> bytes:
@@ -26,7 +27,7 @@ def sort_mirrorlist(raw_data :bytes, sort_order=["https", "http"]) -> bytes:
"""
comments_and_whitespaces = b""
- categories = {key: [] for key in sort_order+["Unknown"]}
+ categories = {key: [] for key in sort_order + ["Unknown"]}
for line in raw_data.split(b"\n"):
if line[0:2] in (b'##', b''):
comments_and_whitespaces += line + b'\n'
@@ -35,16 +36,15 @@ def sort_mirrorlist(raw_data :bytes, sort_order=["https", "http"]) -> bytes:
opening, url = opening.strip(), url.strip()
if (category := url.split(b'://',1)[0].decode('UTF-8')) in categories:
categories[category].append(comments_and_whitespaces)
- categories[category].append(opening+b' = '+url+b'\n')
+ categories[category].append(opening + b' = ' + url + b'\n')
else:
categories["Unknown"].append(comments_and_whitespaces)
- categories["Unknown"].append(opening+b' = '+url+b'\n')
+ categories["Unknown"].append(opening + b' = ' + url + b'\n')
comments_and_whitespaces = b""
-
new_raw_data = b''
- for category in sort_order+["Unknown"]:
+ for category in sort_order + ["Unknown"]:
for line in categories[category]:
new_raw_data += line
@@ -115,7 +115,7 @@ def insert_mirrors(mirrors, *args, **kwargs):
def use_mirrors(
regions: Mapping[str, Iterable[str]],
- destination: str ='/etc/pacman.d/mirrorlist'
+ destination: str = '/etc/pacman.d/mirrorlist'
) -> None:
log(f'A new package mirror-list has been created: {destination}', level=logging.INFO)
with open(destination, 'w') as mirrorlist: