Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib
diff options
context:
space:
mode:
authorDaniel Girtler <blackrabbit256@gmail.com>2022-05-29 18:59:55 +1000
committerGitHub <noreply@github.com>2022-05-29 10:59:55 +0200
commit51714587962570c71fc2dd70de526a5172ad5b5c (patch)
tree555775068fb62fdf91e3b71856811b4aaff20c71 /archinstall/lib
parent0601956b5bdf27ec497a94e7313ea22cf21ecbe0 (diff)
Fix subvol selection (#1277)
* Fix subvolume selection * Update Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/menu/selection_menu.py12
-rw-r--r--archinstall/lib/user_interaction/subvolume_config.py33
2 files changed, 27 insertions, 18 deletions
diff --git a/archinstall/lib/menu/selection_menu.py b/archinstall/lib/menu/selection_menu.py
index 6a693730..d4a7ceef 100644
--- a/archinstall/lib/menu/selection_menu.py
+++ b/archinstall/lib/menu/selection_menu.py
@@ -227,7 +227,7 @@ class GeneralMenu:
""" will be called before each action in the menu """
return
- def post_callback(self, selector_name :str, value :Any):
+ def post_callback(self, selection_name: str = None, value: Any = None):
""" will be called after each action in the menu """
return True
@@ -327,12 +327,12 @@ class GeneralMenu:
break
cursor_pos += 1
- value = value.strip()
+ value = value.strip()
- # if this calls returns false, we exit the menu
- # we allow for an callback for special processing on realeasing control
- if not self._process_selection(value):
- break
+ # if this calls returns false, we exit the menu
+ # we allow for an callback for special processing on realeasing control
+ if not self._process_selection(value):
+ break
if not self.is_context_mgr:
self.__exit__()
diff --git a/archinstall/lib/user_interaction/subvolume_config.py b/archinstall/lib/user_interaction/subvolume_config.py
index af783639..94e6f5d7 100644
--- a/archinstall/lib/user_interaction/subvolume_config.py
+++ b/archinstall/lib/user_interaction/subvolume_config.py
@@ -80,24 +80,33 @@ class SubvolumeMenu(GeneralMenu):
super().__init__(data_store=self.ds)
def _setup_selection_menu_options(self):
- # [str(_('Add')),str(_('Copy')),str(_('Edit')),str(_('Delete'))]
- self._menu_options['name'] = Selector(str(_('Subvolume name ')),
- self._select_subvolume_name if not self.action or self.action in (str(_('Add')),str(_('Copy'))) else None,
+ self._menu_options['name'] = Selector(
+ str(_('Subvolume name ')),
+ self._select_subvolume_name if not self.action or self.action in (str(_('Add')), str(_('Copy'))) else None,
mandatory=True,
enabled=True)
- self._menu_options['mountpoint'] = Selector(str(_('Subvolume mountpoint')),
+
+ self._menu_options['mountpoint'] = Selector(
+ str(_('Subvolume mountpoint')),
self._select_subvolume_mount_point if not self.action or self.action in (str(_('Add')),str(_('Edit'))) else None,
enabled=True)
- self._menu_options['options'] = Selector(str(_('Subvolume options')),
+
+ self._menu_options['options'] = Selector(
+ str(_('Subvolume options')),
self._select_subvolume_options if not self.action or self.action in (str(_('Add')),str(_('Edit'))) else None,
enabled=True)
- self._menu_options['save'] = Selector(str(_('Save')),
- exec_func=lambda n,v:True,
- enabled=True)
- self._menu_options['cancel'] = Selector(str(_('Cancel')),
- # func = lambda pre:True,
- exec_func=lambda n,v:self.fast_exit(n),
- enabled=True)
+
+ self._menu_options['save'] = Selector(
+ str(_('Save')),
+ exec_func=lambda n,v:True,
+ enabled=True)
+
+ self._menu_options['cancel'] = Selector(
+ str(_('Cancel')),
+ # func = lambda pre:True,
+ exec_func=lambda n,v:self.fast_exit(n),
+ enabled=True)
+
self.cancel_action = 'cancel'
self.save_action = 'save'
self.bottom_list = [self.save_action,self.cancel_action]