Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYash Tripathi <tripathiyash97@gmail.com>2021-05-21 03:55:30 +0530
committerYash Tripathi <tripathiyash97@gmail.com>2021-05-21 03:55:30 +0530
commitc834bc5eb9b848346128f6cd948607b733710d0f (patch)
treed82e127b0166be220dc6ac0696ca5c0b25dd7dbc
parent33f1957e4d10d212c87f0500107d426ff871131a (diff)
parent9bb940a8f58bb5522ca4bbcfd378550079c520ac (diff)
Merge branch 'archlinux:master' into master
-rw-r--r--archinstall/lib/mirrors.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py
index 4ef4fa49..a7ed7da3 100644
--- a/archinstall/lib/mirrors.py
+++ b/archinstall/lib/mirrors.py
@@ -5,7 +5,7 @@ from .general import *
from .output import log
-def filter_mirrors_by_region(regions, destination='/etc/pacman.d/mirrorlist', tmp_dir='/root', *args, **kwargs):
+def filter_mirrors_by_region(regions, destination='/etc/pacman.d/mirrorlist', *args, **kwargs):
"""
This function will change the active mirrors on the live medium by
filtering which regions are active based on `regions`.
@@ -16,9 +16,10 @@ def filter_mirrors_by_region(regions, destination='/etc/pacman.d/mirrorlist', tm
region_list = []
for region in regions.split(','):
region_list.append(f'country={region}')
- o = b''.join(SysCommand(f"/usr/bin/wget 'https://archlinux.org/mirrorlist/?{'&'.join(region_list)}&protocol=https&ip_version=4&ip_version=6&use_mirror_status=on' -O {tmp_dir}/mirrorlist"))
- o = b''.join(SysCommand(f"/usr/bin/sed -i 's/#Server/Server/' {tmp_dir}/mirrorlist"))
- o = b''.join(SysCommand(f"/usr/bin/mv {tmp_dir}/mirrorlist {destination}"))
+ response = urllib.request.urlopen(f"https://archlinux.org/mirrorlist/?{'&'.join(region_list)}&protocol=https&ip_version=4&ip_version=6&use_mirror_status=on'")
+ new_list = response.read().replace(b"#Server", b"Server")
+ with open(destination, "wb") as mirrorlist:
+ mirrorlist.write(new_list)
return True