diff --git a/subiquity/models/filesystem.py b/subiquity/models/filesystem.py index 79af5fd9..6b10bc58 100644 --- a/subiquity/models/filesystem.py +++ b/subiquity/models/filesystem.py @@ -1199,6 +1199,10 @@ class LVM_LogicalVolume(_Formattable): def flag(self): return None # hack! + @property + def is_esp(self): + return False # another hack! + def desc(self): return _("LVM logical volume") diff --git a/subiquity/ui/views/help.py b/subiquity/ui/views/help.py index 032e160b..88ed7b07 100644 --- a/subiquity/ui/views/help.py +++ b/subiquity/ui/views/help.py @@ -290,7 +290,9 @@ class OpenHelpMenu(WidgetWrap): rich = menu_item( _("Toggle rich mode"), on_press=self.parent.toggle_rich) buttons.add(rich) - local_title, local_doc = parent.app.ui.body.local_help() + local_title = None + if hasattr(parent.app.ui.body, 'local_help'): + local_title, local_doc = parent.app.ui.body.local_help() if local_title is not None: local = menu_item( local_title, diff --git a/subiquity/ui/views/refresh.py b/subiquity/ui/views/refresh.py index e9e35bed..1f908221 100644 --- a/subiquity/ui/views/refresh.py +++ b/subiquity/ui/views/refresh.py @@ -185,7 +185,7 @@ class RefreshView(BaseView): ]) buttons.base_widget.focus_position = 1 - self.title = self.failed_title + self.title = self.check_failed_title self._w = screen(rows, buttons, excerpt=_(self.failed_excerpt)) def try_check_again(self, sender=None): diff --git a/subiquitycore/ui/views/network_configure_manual_interface.py b/subiquitycore/ui/views/network_configure_manual_interface.py index 7d6f1da5..be2d1a4f 100644 --- a/subiquitycore/ui/views/network_configure_manual_interface.py +++ b/subiquitycore/ui/views/network_configure_manual_interface.py @@ -112,7 +112,7 @@ class NetworkConfigForm(Form): if address not in subnet: raise ValueError( _("'{address}' is not contained in '{subnet}'").format( - address, subnet) + address=address, subnet=subnet) ) return address