Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Llácer <wllacer@gmail.com>2022-01-18 20:57:30 +0100
committerGitHub <noreply@github.com>2022-01-18 20:57:30 +0100
commitc776e30191224b3a6cd9d3712576e88b54bf1ca6 (patch)
treecec2d78219f9c324764f6c7f7715647c4c7e3196
parent3d30a4eb28bd84713571c52622cb88b6458076a5 (diff)
Some issues at Guided.py (#878)
* Solves issue #873 (error by key sys-language Now disk_layouts file contents are loaded before calling the menu * Solves issue #873 (error by key sys-language. Solution in previous commit was still too restrictive
-rw-r--r--archinstall/__init__.py9
-rw-r--r--archinstall/lib/menu/selection_menu.py2
2 files changed, 7 insertions, 4 deletions
diff --git a/archinstall/__init__.py b/archinstall/__init__.py
index dc63b498..c0e9b8bd 100644
--- a/archinstall/__init__.py
+++ b/archinstall/__init__.py
@@ -163,10 +163,13 @@ def post_process_arguments(arguments):
load_plugin(arguments['plugin'])
if arguments.get('disk_layouts', None) is not None:
- if 'disk_layouts' not in storage:
- storage['disk_layouts'] = {}
- if not json_stream_to_structure('--disk_layouts',arguments['disk_layouts'],storage['disk_layouts']):
+ # if 'disk_layouts' not in storage:
+ # storage['disk_layouts'] = {}
+ layout_storage = {}
+ if not json_stream_to_structure('--disk_layouts',arguments['disk_layouts'],layout_storage):
exit(1)
+ else:
+ arguments['disk_layouts'] = layout_storage
define_arguments()
diff --git a/archinstall/lib/menu/selection_menu.py b/archinstall/lib/menu/selection_menu.py
index fa997473..fe9b4160 100644
--- a/archinstall/lib/menu/selection_menu.py
+++ b/archinstall/lib/menu/selection_menu.py
@@ -240,7 +240,7 @@ class GlobalMenu:
self._process_selection(selection)
for key in self._menu_options:
sel = self._menu_options[key]
- if sel.enabled and sel.has_selection() and key not in archinstall.arguments:
+ if key not in archinstall.arguments:
archinstall.arguments[key] = sel._current_selection
def _process_selection(self, selection):