RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Forgot a few imports

This commit is contained in:
Anton Hvornum 2020-11-29 19:52:14 +00:00
parent 9db54786f0
commit 77e3782374
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/lib/profiles.py
View File

@ -5,7 +5,7 @@ from .general import multisplit, sys_command, log
from .exceptions import * from .exceptions import *
from .networking import * from .networking import *
from .output import log, LOG_LEVELS from .output import log, LOG_LEVELS
from .storage import storage, UPSTREAM_URL, PROFILE_DB from .storage import storage, UPSTREAM_URL, PROFILE_DB, PROFILE_PATH
def grab_url_data(path): def grab_url_data(path):
safe_path = path[:path.find(':')+1]+''.join([item if item in ('/', '?', '=', '&') else urllib.parse.quote(item) for item in multisplit(path[path.find(':')+1:], ('/', '?', '=', '&'))]) safe_path = path[:path.find(':')+1]+''.join([item if item in ('/', '?', '=', '&') else urllib.parse.quote(item) for item in multisplit(path[path.find(':')+1:], ('/', '?', '=', '&'))])
@ -42,9 +42,9 @@ def list_profiles(filter_irrelevant_macs=True):
break break
# Grab profiles from upstream URL # Grab profiles from upstream URL
if UPSTREAM_DB: if PROFILE_DB:
try: try:
profile_list = json.loads(grab_url_data(os.path.join(UPSTREAM_URL, UPSTREAM_DB))) profile_list = json.loads(grab_url_data(os.path.join(UPSTREAM_URL, PROFILE_DB)))
except urllib.error.UTTPError as err: except urllib.error.UTTPError as err:
print(f'Error: Listing profiles on URL "{UPSTREAM_URL}" resulted in:', err) print(f'Error: Listing profiles on URL "{UPSTREAM_URL}" resulted in:', err)
return cache return cache

2
archinstall/lib/storage.py
View File

@ -1,3 +1,5 @@
import os
storage = {} storage = {}
# There's a few scenarios of execution: # There's a few scenarios of execution: