Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan M. Taylor <dylan@dylanmtaylor.com>2021-05-27 23:24:26 -0400
committerGitHub <noreply@github.com>2021-05-27 23:24:26 -0400
commit8d7045b64c829496b4eee81c377e5d7c78b7627a (patch)
treeee58f85647cd3083a0d40b1f911535a155f8782b
parent04e58f98fac6a3834d3ce60f3a13f0bb980b165e (diff)
parent3aee3611c4081272c622a86f09bbd1c8c382b098 (diff)
Merge pull request #6 from l4zy0n3/patch-2
added support for setting mirror-region to a dict or a string in config
-rw-r--r--examples/guided.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/examples/guided.py b/examples/guided.py
index 320bcfd8..42429370 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -444,12 +444,18 @@ else:
archinstall.arguments['harddrive'].keep_partitions = False
# Temporary workaround to make Desktop Environments work
if archinstall.arguments.get('profile', None) is not None:
- archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None))
+ if type(archinstall.arguments.get('profile', None)) is dict:
+ archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None)['path'])
+ else:
+ archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None))
else:
archinstall.arguments['profile'] = None
if archinstall.arguments.get('mirror-region', None) is not None:
- selected_region = archinstall.arguments.get('mirror-region', None)
- archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[selected_region]}
+ if type(archinstall.arguments.get('mirror-region', None)) is dict:
+ archinstall.arguments['mirror-region'] = archinstall.arguments.get('mirror-region', None)
+ else:
+ selected_region = archinstall.arguments.get('mirror-region', None)
+ archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[selected_region]}
archinstall.arguments['sys-language'] = archinstall.arguments.get('sys-language', 'en_US')
archinstall.arguments['sys-encoding'] = archinstall.arguments.get('sys-encoding', 'utf-8')
if archinstall.arguments.get('gfx_driver', None) is not None: