Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2020-12-06 12:03:36 +0100
committerAnton Hvornum <anton.feeds+github@gmail.com>2020-12-06 12:03:36 +0100
commit1edb8f6f7224d7d715ce622266e9b5fdc8da3da2 (patch)
treefdf032af9e91f2008d0d876aab3af69e55a9870a
parentb6c6e414b1a46fed7f118e7c441cb29ba26b5dc8 (diff)
Added additional user-verification to guided.py
Also spelling error in subpath
-rw-r--r--archinstall/lib/profiles.py8
-rw-r--r--examples/guided.py2
2 files changed, 6 insertions, 4 deletions
diff --git a/archinstall/lib/profiles.py b/archinstall/lib/profiles.py
index cf5bca91..c2aa2aa2 100644
--- a/archinstall/lib/profiles.py
+++ b/archinstall/lib/profiles.py
@@ -15,7 +15,7 @@ def grab_url_data(path):
response = urllib.request.urlopen(safe_path, context=ssl_context)
return response.read()
-def list_profiles(filter_irrelevant_macs=True, sub_path=''):
+def list_profiles(filter_irrelevant_macs=True, subpath=''):
# TODO: Grab from github page as well, not just local static files
if filter_irrelevant_macs:
local_macs = list_interfaces()
@@ -23,7 +23,7 @@ def list_profiles(filter_irrelevant_macs=True, sub_path=''):
cache = {}
# Grab all local profiles found in PROFILE_PATH
for PATH_ITEM in storage['PROFILE_PATH']:
- for root, folders, files in os.walk(os.path.abspath(os.path.expanduser(PATH_ITEM+sub_path))):
+ for root, folders, files in os.walk(os.path.abspath(os.path.expanduser(PATH_ITEM+subpath))):
for file in files:
if os.path.splitext(file)[1] == '.py':
tailored = False
@@ -43,7 +43,7 @@ def list_profiles(filter_irrelevant_macs=True, sub_path=''):
# Grab profiles from upstream URL
if storage['PROFILE_DB']:
- profiles_url = os.path.join(storage["UPSTREAM_URL"]+sub_path, storage['PROFILE_DB'])
+ profiles_url = os.path.join(storage["UPSTREAM_URL"]+subpath, storage['PROFILE_DB'])
try:
profile_list = json.loads(grab_url_data(profiles_url))
except urllib.error.HTTPError as err:
@@ -61,7 +61,7 @@ def list_profiles(filter_irrelevant_macs=True, sub_path=''):
continue
tailored = True
- cache[profile[:-3]] = {'path' : os.path.join(storage["UPSTREAM_URL"]+sub_path, profile), 'description' : profile_list[profile], 'tailored' : tailored}
+ cache[profile[:-3]] = {'path' : os.path.join(storage["UPSTREAM_URL"]+subpath, profile), 'description' : profile_list[profile], 'tailored' : tailored}
return cache
diff --git a/examples/guided.py b/examples/guided.py
index 38894292..3ebdcd14 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -226,6 +226,8 @@ archinstall.log("-- Guided template chosen (with below config) --", level=archin
archinstall.log(json.dumps(archinstall.storage['_guided'], indent=4, sort_keys=True, cls=archinstall.JSON), level=archinstall.LOG_LEVELS.Info)
print()
+input('Press Enter to continue.')
+
"""
Issue a final warning before we continue with something un-revertable.
We mention the drive one last time, and count from 5 to 0.